diff --git a/conf.d/sf-hedgedoc.conf b/conf.d/sf-hedgedoc.conf
index 4199065..cde7d66 100644
--- a/conf.d/sf-hedgedoc.conf
+++ b/conf.d/sf-hedgedoc.conf
@@ -1,15 +1,15 @@
 server {
     listen 80;
-    server_name sf-hedgedoc.psi.ch;
+    server_name hedgedoc.psi.ch;
     return 301 https://$host$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name sf-hedgedoc.psi.ch;
+    server_name hedgedoc.psi.ch;
 
-    ssl_certificate /etc/nginx/certs/sf-hedgedoc.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/sf-hedgedoc.psi.ch.key;
+    ssl_certificate /etc/nginx/certs/hedgedoc.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/hedgedoc.psi.ch.key;
 
     location / {
         proxy_pass http://hedgedoc_app:3000;
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a7a6ef3..94901e2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -60,10 +60,10 @@ services:
   # Augustin Sven <sven.augustin@psi.ch>
   hedgedoc_app:
     image: quay.io/hedgedoc/hedgedoc:1.10.1
-    container_name: sf_hedgedoc
+    container_name: hedgedoc
     environment:
       - CMD_DB_URL=postgres://${hedgedoc_user}:${hedgedoc_password}@hedgedoc_db:5432/hedgedoc
-      - CMD_DOMAIN=sf-hedgedoc.psi.ch
+      - CMD_DOMAIN=hedgedoc.psi.ch
       - CMD_URL_ADDPORT=false
       - CMD_PROTOCOL_USESSL=true
       - CMD_LDAP_URL=ldaps://dc00.d.psi.ch
@@ -89,7 +89,7 @@ services:
   # Augustin Sven <sven.augustin@psi.ch>
   hedgedoc_db:
     image: postgres:13.4-alpine
-    container_name: sf_hedgedoc_db
+    container_name: hedgedoc_db
     environment:
       - POSTGRES_USER={{ hedgedoc_user }}
       - POSTGRES_PASSWORD={{ hedgedoc_password }}