diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 112c58f31a014bf9312681fd7934d35148753879..dd2b86173c43123f9ad46d7b3c1d83597d8460f7 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -76,15 +76,6 @@ services:
       TZ: Europe/Vienna
     ports:
       - "9095:9095"
-    depends_on:
-      fda-container-service:
-        condition: service_healthy
-      fda-database-service:
-        condition: service_healthy
-      fda-table-service:
-        condition: service_healthy
-      fda-query-service:
-        condition: service_healthy
     logging:
       driver: json-file
 
@@ -108,6 +99,8 @@ services:
     depends_on:
       fda-discovery-service:
         condition: service_healthy
+      fda-authentication-service:
+        condition: service_healthy
       fda-broker-service:
         condition: service_healthy
       fda-metadata-db:
@@ -136,6 +129,8 @@ services:
     depends_on:
       fda-discovery-service:
         condition: service_healthy
+      fda-authentication-service:
+        condition: service_healthy
       fda-metadata-db:
         condition: service_healthy
     logging:
@@ -150,8 +145,6 @@ services:
     networks:
       fda-public:
         ipv4_address: 172.29.0.14
-    volumes:
-      - /tmp:/tmp
     environment:
       SPRING_PROFILES_ACTIVE: docker
       TZ: Europe/Vienna
@@ -162,8 +155,6 @@ services:
         condition: service_healthy
       fda-discovery-service:
         condition: service_healthy
-      fda-gateway-service:
-        condition: service_healthy
       fda-discovery-service:
         condition: service_healthy
     logging:
@@ -191,6 +182,8 @@ services:
         condition: service_healthy
       fda-container-service:
         condition: service_healthy
+      fda-authentication-service:
+        condition: service_healthy
       fda-table-service:
         condition: service_healthy
       fda-metadata-db:
@@ -222,6 +215,8 @@ services:
         condition: service_healthy
       fda-discovery-service:
         condition: service_healthy
+      fda-authentication-service:
+        condition: service_healthy
       fda-broker-service:
         condition: service_healthy
       fda-database-service:
@@ -248,6 +243,8 @@ services:
     depends_on:
       fda-metadata-db:
         condition: service_healthy
+      fda-authentication-service:
+        condition: service_healthy
       fda-discovery-service:
         condition: service_healthy
       fda-query-service:
@@ -326,7 +323,7 @@ services:
     container_name: fda-search-service
     hostname: fda-search-service
     image: elasticsearch:7.13.4
-    command: ["elasticsearch"]
+    command: [ "elasticsearch" ]
     networks:
       fda-public:
         ipv4_address: 172.29.0.6
@@ -358,9 +355,17 @@ services:
       - /tmp:/tmp
       - "./fda-ui/.prod:/certs"
     depends_on:
-      fda-gateway-service:
+      fda-container-service:
         condition: service_healthy
-      fda-discovery-service:
+      fda-database-service:
+        condition: service_healthy
+      fda-table-service:
+        condition: service_healthy
+      fda-query-service:
+        condition: service_healthy
+      fda-identifier-service:
+        condition: service_healthy
+      fda-authentication-service:
         condition: service_healthy
     environment:
       HOST: 0.0.0.0