diff --git a/files/etc/nginx/hedgedocs-nginx.conf.j2 b/files/etc/nginx/hedgedocs-nginx.conf.j2
index eb0cdfcd5e85fef405df369125700b1d36c3db09..823e85a448a9024bf45d26e78e5ba89397714638 100644
--- a/files/etc/nginx/hedgedocs-nginx.conf.j2
+++ b/files/etc/nginx/hedgedocs-nginx.conf.j2
@@ -3,7 +3,7 @@ map $http_upgrade $connection_upgrade {
         ''      close;
 }
 server {
-        server_name {{ service_hedgedocs_domain.split("//")[0] | lower  }};
+        server_name {{ service_hedgedocs_domain.split(":")[1] | lower  }};
 
         location / {
                 proxy_pass http://127.0.0.1:3000;
@@ -26,8 +26,8 @@ server {
     listen [::]:443 ssl http2;
     listen 443 ssl http2;
 
-    ssl_certificate /etc/letsencrypt/live/{{ service_hedgedocs_domain.split("//")[0] | lower  }}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/{{ service_hedgedocs_domain.split("//")[0] | lower  }}/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/{{ service_hedgedocs_domain.split(":")[1] | lower  }}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/{{ service_hedgedocs_domain.split(":")[1] | lower  }}/privkey.pem;
 
   	# Improve HTTPS performance with session resumption
   	ssl_session_cache shared:SSL:10m;
diff --git a/files/hedgedocs.service b/files/hedgedocs.service
index b75d2dec5f3902bf524db609f2bbf647d6bcc4b2..2a5392354920a7e6604f73b5a01d01e6e08fdd42 100644
--- a/files/hedgedocs.service
+++ b/files/hedgedocs.service
@@ -13,7 +13,7 @@ RestartSec=2s
 User=hedgedocs
 Group=www-data
 # the location you cloned CodiMD to.
-WorkingDirectory=/home/hedgedocs
+WorkingDirectory=/home/hedgedocs/hedgedoc
 ExecStart=/usr/bin/npm start --production
 Restart=always
 PrivateTmp=true