diff --git a/docker/.env b/docker/.env
index da0b2def4..89d638449 100644
--- a/docker/.env
+++ b/docker/.env
@@ -7,8 +7,8 @@ HD_DATABASE_TYPE="postgres"
 HD_DATABASE_HOST="db"
 HD_DATABASE_PORT="5432"
 HD_DATABASE_NAME="hedgedoc"
-HD_DATABASE_USER="hedgedoc"
-HD_DATABASE_PASS="password"
+HD_DATABASE_USERNAME="hedgedoc"
+HD_DATABASE_PASSWORD="password"
 
 # Uploads
 HD_MEDIA_BACKEND="filesystem"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index dc162c2b9..cdee53c6b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   backend:
     image: ghcr.io/hedgedoc/hedgedoc/backend:develop
     volumes:
-      - $PWD/.env:/usr/src/app/backend/.env
+      - ./.env:/usr/src/app/backend/.env
       - hedgedoc_uploads:/usr/src/app/backend/uploads
 
   frontend:
@@ -16,8 +16,8 @@ services:
   db:
     image: postgres:15
     environment:
-      POSTGRES_USER: "${HD_DATABASE_USER}"
-      POSTGRES_PASSWORD: "${HD_DATABASE_PASS}"
+      POSTGRES_USER: "${HD_DATABASE_USERNAME}"
+      POSTGRES_PASSWORD: "${HD_DATABASE_PASSWORD}"
       POSTGRES_DB: "${HD_DATABASE_NAME}"
 
   proxy:
@@ -30,7 +30,7 @@ services:
       - "443:443"
       - "443:443/udp"
     volumes:
-      - $PWD/Caddyfile:/etc/caddy/Caddyfile
+      - ./Caddyfile:/etc/caddy/Caddyfile
       - caddy_data:/data
 
 volumes: