diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 27b194cc..2699e024 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -28,10 +28,13 @@ services:
   php-debug:
     container_name: esmero-php-debug
     restart: always
-    image: esmero/php-7.3-fpm:development
+    image: esmero/php-7.4-fpm:1.0.0-dev-multiarch
+    environment:
+      - XDEBUG_SESSION_START="archipelago"
     tty: true
     networks:
       - host-net
       - esmero-net
     volumes:
       - ${PWD}:/var/www/html:cached
+      - ${PWD}/xdebug/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
diff --git a/xdebug/xdebug.ini b/xdebug/xdebug.ini
new file mode 100644
index 00000000..f2f018fb
--- /dev/null
+++ b/xdebug/xdebug.ini
@@ -0,0 +1,9 @@
+zend_extension=xdebug
+
+[xdebug]
+xdebug.mode=develop,debug
+; If your host system is Linux, host.docker.internal may not be available.
+xdebug.client_host=host.docker.internal
+; On linux comment xdebug.client_host=host.docker.internal and uncomment the following next line
+;xdebug.discover_client_host=1
+xdebug.start_with_request=yes