diff --git a/docker-compose.yaml b/docker-compose.yaml
index d3c89c4a9..7637c500a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,9 +5,6 @@
 # Build:  DOCKER_BUILDKIT=1 docker compose build
 # Run:    docker compose up -d
 services:
-  # Message broker for payment event delivery (payment-api -> passenger/freight).
-  # Management UI: http://localhost:15672 (login edr / edr_secret). vhost: payment.
-  # In deployed envs this is a shared/managed RabbitMQ; only PAYMENT_RABBITMQ_URL changes.
   freight-api:
     build:
       context: .
@@ -21,26 +18,19 @@ services:
     extra_hosts:
       - "paymentcallback.triaplc.com:10.18.7.179"
 
-  # Standalone GT06 GPS tracker ingester (@edr/gps-tracker). Raw TCP only, no
-  # HTTP. Writes freight.gps_devices / freight.gps_positions in the shared
-  # freight DB; the /gps REST API stays in freight-api. Never runs migrations.
   gps-tracker:
     build:
       context: .
       dockerfile: apps/edr-gps-tracker/Dockerfile
       secrets:
         - npmrc
-    depends_on:
-      - freight-api
     ports:
-      # Raw TCP — reachable by tracker SIMs. Not HTTP; no L7 proxy can host-route it.
       - "${GT06_TCP_PORT:-5023}:5023"
     environment:
       GT06_TCP_PORT: "5023"
       GT06_TCP_HOST: "0.0.0.0"
     env_file:
-      # Reuses the freight DB credentials (DB_HOST/DB_PORT/DB_USER/DB_PASSWORD/DB_NAME).
-      - apps/edr-freight-api/.env
+      - apps/edr-gps-tracker/.env
     restart: unless-stopped
 
   passenger-api:
@@ -54,17 +44,7 @@ services:
     extra_hosts:
       - "paymentcallback.triaplc.com:10.18.7.179"
     restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost:4000/health/ready"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 60s
-    deploy:
-      resources:
-        limits:
-          cpus: '1.0'
-          memory: 1G
+ 
   freight-portal:
     build:
       context: .
@@ -80,6 +60,7 @@ services:
         - npmrc
     ports:
       - "${FREIGHT_PORTAL_PORT:-5173}:80"
+  
   freight-backoffice:
     build:
       context: .
@@ -95,6 +76,7 @@ services:
         - npmrc
     ports:
       - "${FREIGHT_BACKOFFICE_PORT:-5183}:80"
+  
   passenger-portal:
     build:
       context: .
@@ -110,17 +92,7 @@ services:
     env_file:
       - apps/edr-passenger-web/portal/.env
     restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost:${PASSENGER_PORTAL_PORT:-5174}/api/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 60s
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
+  
   passenger-backoffice:
     build:
       context: .
@@ -136,17 +108,6 @@ services:
     env_file:
       - apps/edr-passenger-web/backoffice/.env
     restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost:${PASSENGER_BACKOFFICE_PORT:-5184}/api/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 60s
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
   
   payment-api:
     build: