diff --git a/docker-compose.yml b/docker-compose.yml
index c70c47a..bc54229 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 services:
-  twin-optimiser-backend:
+  backend:
     build: ./backend
-    container_name: twin-optimiser-backend
-    restart: unless-stopped
+    security_opt:
+      - apparmor=unconfined
     environment:
       DATABASE_URL:        ${DATABASE_URL}
       CENTRAL_AUTH_SECRET: ${CENTRAL_AUTH_SECRET}
@@ -10,23 +10,27 @@ services:
       SETTINGS_SECRET:     ${SETTINGS_SECRET}
       APP_SLUG:            twin-optimiser
       OFFICE_IP_CHECK:     ${OFFICE_IP_CHECK:-disabled}
-    networks:
-      - hnf_net
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:3001/health || exit 1"]
+      interval: 10s
+      retries: 5
+      start_period: 20s
+    restart: unless-stopped
 
-  twin-optimiser-frontend:
+  frontend:
     build:
       context: ./frontend
       args:
         VITE_HOTEL_NAME: ${VITE_HOTEL_NAME}
-    container_name: twin-optimiser-frontend
-    restart: unless-stopped
+    security_opt:
+      - apparmor=unconfined
     ports:
       - "${FRONTEND_PORT:-3080}:80"
     depends_on:
-      - twin-optimiser-backend
-    networks:
-      - hnf_net
+      backend:
+        condition: service_healthy
+    restart: unless-stopped
 
 networks:
-  hnf_net:
-    external: true
+  default:
+    driver: bridge