diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2910de9f22f1ed8514ae0b0368b0edfbf4c69b9f..d2db80a28272273e802e024e72b47c8e73d338db 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,17 +12,6 @@
             "pathMappings": {
                 "/metager/metager_app": "${workspaceRoot}/metager"
             }
-        },
-        {
-            "name": "PHP - Launch currently open script",
-            "type": "php",
-            "request": "launch",
-            "port": 9003,
-            "program": "${file}",
-            "cwd": "${fileDirname}",
-            "pathMappings": {
-                "/metager/metager_app": "${workspaceRoot}/metager"
-            }
         }
     ]
 }
\ No newline at end of file
diff --git a/build/fpm/configuration/php/development.ini b/build/fpm/configuration/php/development.ini
index c06cc5178a4861f7f0e2060fafb55718442711a4..b9f6c91adb6d0387c0a8e6f752de5be8b20e9acf 100644
--- a/build/fpm/configuration/php/development.ini
+++ b/build/fpm/configuration/php/development.ini
@@ -5,8 +5,7 @@ expose_php = On
 xdebug.mode = debug
 xdebug.log_level= 0
 xdebug.start_with_request = yes
-xdebug.discover_client_host = true
-xdebug.idekey=VSCODE
+xdebug.client_host=host.docker.internal
 
 ; OP cache
 opcache.enable=0
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a9ddd2b139f60472a42feda573787fc6e0b66e02..9b1558beebe900d18cde7a311a55bcb974bfe076 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,8 @@ services:
       - metager
     volumes:
       - ./metager:/metager/metager_app
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     healthcheck:
       test: "curl -f http://nginx:8080/health-check/liveness"
   nginx:
@@ -46,6 +48,8 @@ services:
       - metager
     volumes:
       - ./metager:/metager/metager_app
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     healthcheck:
       test: "curl -f http://nginx:8080/health-check/liveness-scheduler"
   worker:
@@ -57,7 +61,7 @@ services:
     networks:
       - metager
     extra_hosts:
-      - "dockerhost:192.168.5.1"
+      - "host.docker.internal:host-gateway"
     volumes:
       - ./metager:/metager/metager_app
     healthcheck:
@@ -112,4 +116,4 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: "192.168.5.0/24"
\ No newline at end of file
+        - subnet: "192.168.5.0/24"