diff --git a/docker-compose.yaml b/docker-compose.yaml
index a621749dc..3659e963f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,21 +9,18 @@ services:
     build:
       context: .
       dockerfile: apps/edr-freight-api/Dockerfile
-      secrets:
-        - npmrc
     ports:
       - "${FREIGHT_API_PORT:-3001}:${FREIGHT_API_PORT:-3001}"
     env_file:
       - apps/edr-freight-api/.env
     extra_hosts:
       - "paymentcallback.triaplc.com:10.18.7.179"
+    restart: always
 
   gps-tracker:
     build:
       context: .
       dockerfile: apps/edr-gps-tracker/Dockerfile
-      secrets:
-        - npmrc
     ports:
       - "${GT06_TCP_PORT:-5023}:5023"
     environment:
@@ -31,8 +28,8 @@ services:
       GT06_TCP_HOST: "0.0.0.0"
     env_file:
       - apps/edr-gps-tracker/.env
-    restart: unless-stopped
-
+    restart: always
+  
   passenger-api:
     build:
       context: .
@@ -43,8 +40,8 @@ services:
       - apps/edr-passenger-api/.env
     extra_hosts:
       - "paymentcallback.triaplc.com:10.18.7.179"
-    restart: unless-stopped
- 
+    restart: always
+
   freight-portal:
     build:
       context: .
@@ -58,11 +55,10 @@ services:
         VITE_GOOGLE_MAPS_API_KEY: ${VITE_GOOGLE_MAPS_API_KEY:-}
         VITE_POSTHOG_KEY: ${VITE_POSTHOG_KEY:-}
         VITE_POSTHOG_HOST: ${VITE_POSTHOG_HOST:-}
-      secrets:
-        - npmrc
     ports:
       - "${FREIGHT_PORTAL_PORT:-5173}:80"
-  
+    restart: always
+
   freight-backoffice:
     build:
       context: .
@@ -76,11 +72,10 @@ services:
         VITE_GOOGLE_MAPS_API_KEY: ${VITE_GOOGLE_MAPS_API_KEY:-}
         VITE_POSTHOG_KEY: ${VITE_POSTHOG_KEY:-}
         VITE_POSTHOG_HOST: ${VITE_POSTHOG_HOST:-}
-      secrets:
-        - npmrc
     ports:
       - "${FREIGHT_BACKOFFICE_PORT:-5183}:80"
-  
+    restart: always
+
   passenger-portal:
     build:
       context: .
@@ -89,14 +84,12 @@ services:
         APP_PACKAGE: "@edr/passenger-portal"
         APP_PATH: apps/edr-passenger-web/portal
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-}
-      secrets:
-        - npmrc
     ports:
       - "${PASSENGER_PORTAL_PORT:-5174}:${PASSENGER_PORTAL_PORT:-5174}"
     env_file:
       - apps/edr-passenger-web/portal/.env
-    restart: unless-stopped
-  
+    restart: always
+
   passenger-backoffice:
     build:
       context: .
@@ -105,14 +98,12 @@ services:
         APP_PACKAGE: "@edr/passenger-backoffice"
         APP_PATH: apps/edr-passenger-web/backoffice
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-}
-      secrets:
-        - npmrc
     ports:
       - "${PASSENGER_BACKOFFICE_PORT:-5184}:${PASSENGER_BACKOFFICE_PORT:-5184}"
     env_file:
       - apps/edr-passenger-web/backoffice/.env
-    restart: unless-stopped
-  
+    restart: always
+
   payment-api:
     build:
       context: .
@@ -120,12 +111,8 @@ services:
       args:
         APP_PACKAGE: "@edr/payment-api"
         APP_PATH: apps/edr-payment-api
-      secrets:
-        - npmrc
     ports:
       - "${PAYMENT_API_PORT:-3008}:${PAYMENT_API_PORT:-3008}"
     env_file:
       - apps/edr-payment-api/.env
-secrets:
-  npmrc:
-    file: .npmrc
+    restart: always