diff --git a/.env.example b/.env.example
index 766894992..e4a935626 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,7 @@
 COMPOSE_PROJECT_NAME=ghostfolio
 
 # CACHE
-REDIS_HOST=localhost
+REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_PASSWORD=<INSERT_REDIS_PASSWORD>
 
@@ -12,5 +12,5 @@ POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
 
 # VARIOUS
 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
 JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c6ec5b3d7..bf3f8252e 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   ghostfolio:
     image: docker.io/ghostfolio/ghostfolio:latest
     container_name: ghostfolio
+    restart: unless-stopped
     init: true
     cap_drop:
       - ALL
@@ -10,10 +11,6 @@ services:
       - no-new-privileges:true
     env_file:
       - ../.env
-    environment:
-      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
-      REDIS_HOST: redis
-      REDIS_PASSWORD: ${REDIS_PASSWORD}
     ports:
       - 3333:3333
     depends_on:
@@ -22,14 +19,15 @@ services:
       redis:
         condition: service_healthy
     healthcheck:
-      test: ['CMD-SHELL', 'curl -f http://localhost:3333/api/v1/health']
+      test: [ 'CMD-SHELL', 'curl -f http://localhost:3333/api/v1/health' ]
       interval: 10s
       timeout: 5s
       retries: 5
 
   postgres:
-    image: docker.io/library/postgres:15
+    image: docker.io/library/postgres:15-alpine
     container_name: gf-postgres
+    restart: unless-stopped
     cap_drop:
       - ALL
     cap_add:
@@ -43,7 +41,7 @@ services:
     env_file:
       - ../.env
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}']
+      test: [ 'CMD-SHELL', 'pg_isready -d "$${POSTGRES_DB}" -U $${POSTGRES_USER}' ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -53,6 +51,7 @@ services:
   redis:
     image: docker.io/library/redis:alpine
     container_name: gf-redis
+    restart: unless-stopped
     user: '999:1000'
     cap_drop:
       - ALL
@@ -60,9 +59,16 @@ services:
       - no-new-privileges:true
     env_file:
       - ../.env
-    command: ['redis-server', '--requirepass', $REDIS_PASSWORD]
+    command:
+      - /bin/sh
+      - -c
+      # - Double dollars, so that the variable is not expanded by Docker Compose
+      # - Surround by quotes, so that the shell does not split the password
+      # - The ${variable:?message} syntax causes shell to exit with a non-zero
+      #   code and print a message, when the variable is not set or empty
+      - redis-server --requirepass "$${REDIS_PASSWORD:?REDIS_PASSWORD variable is not set}"
     healthcheck:
-      test: ['CMD-SHELL', 'redis-cli --pass "$REDIS_PASSWORD" ping | grep PONG']
+      test: [ 'CMD-SHELL', 'redis-cli --pass "$${REDIS_PASSWORD}" ping | grep PONG' ]
       interval: 10s
       timeout: 5s
       retries: 5