diff --git a/docker-compose.yml b/docker-compose.yml
index 56a6a5d..4bbabef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
-  auth:
-    build: ./EvoCalculator.Auth
+  auth_service:
+    build: ./EvoCalculator.Auth/auth-service
     environment:
       - bindDN=ldap_usename
       - bindCredentials=ldap_password
@@ -12,6 +12,14 @@ services:
     labels:
       - 'traefik.enable=false'
 
+  auth:
+    build: ./EvoCalculator.Auth/auth-client
+    networks:
+      - calc_network
+    restart: always
+    labels:
+      - 'traefik.enable=false'
+
   mongodb:
     image: mongo:latest
     networks:
@@ -25,12 +33,9 @@ services:
       - core
     networks:
       - calc_network
-    links:
-      - core
     labels:
       - 'traefik.enable=false'
-  
-  
+
   core:
     build: ./EvoCalculator.Core
     ports:
@@ -40,8 +45,7 @@ services:
     labels:
       - 'traefik.enable=false'
 
-
-      proxy:
+  proxy:
     container_name: proxy
     restart: always
     build: ./EvoCalculator.Proxy
@@ -51,11 +55,11 @@ services:
       - web
       - calc_network
     depends_on:
-      - client
       - auth
-    links:
+      - auth_service
       - client
-      - auth
+      - core
+      - mongodb
     labels:
       - 'traefik.enable=true'
       - 'traefik.backend=proxy'
@@ -70,6 +74,6 @@ volumes:
 
 networks:
   calc_network:
-    driver: bridge
+    external: false
   web:
     external: true