diff --git a/docker-compose.yml b/docker-compose.yml
index d752fc8..97740e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
       - "8080:8080"
     env_file:
       - ./gateway.env
+    restart: on-failure
 
   server:
     image: registry.boomlab.party/rheinsw/rheinsw-mono-repo/server
@@ -14,11 +15,15 @@ services:
       - "8081:8081"
     env_file:
       - ./server.env
+    restart: on-failure
 
   frontend:
     image: registry.boomlab.party/rheinsw/rheinsw-mono-repo/frontend
     container_name: frontend
+    volumes:
+      - ./frontend.env:/app/.env  # Mount it as .env at runtime
     env_file:
       - ./frontend.env
     ports:
       - "5100:3000"
+    restart: on-failure