diff --git a/docker-compose-ci-template.yaml b/docker-compose-ci-template.yaml
index b407aa8..3daf1ae 100644
--- a/docker-compose-ci-template.yaml
+++ b/docker-compose-ci-template.yaml
@@ -36,10 +36,6 @@ services:
       dockerfile: ./docker/Dockerfile-jenkins-php
     depends_on:
       - database
-    environment:
-      XDEBUG_CLIENT_HOST: 127.17.0.1
-      XDEBUG_CLIENT_PORT: 9003
-      PHP_IDE_CONFIG: serverName=ogcore
     networks:
       - ogcore-network
     image: ogcore-php:static
diff --git a/docker-compose-ci.yaml b/docker-compose-ci.yaml
index d6442f7..897d8c5 100644
--- a/docker-compose-ci.yaml
+++ b/docker-compose-ci.yaml
@@ -35,10 +35,6 @@ services:
       dockerfile: ./docker/Dockerfile-jenkins-php
     depends_on:
       - database
-    environment:
-      XDEBUG_CLIENT_HOST: 127.17.0.1
-      XDEBUG_CLIENT_PORT: 9003
-      PHP_IDE_CONFIG: serverName=ogcore
     networks:
       - ogcore-network
 
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
index 4c9bf3b..62a5a22 100644
--- a/docker-compose-deploy.yml
+++ b/docker-compose-deploy.yml
@@ -36,10 +36,6 @@ services:
       dockerfile: ./docker/Dockerfile-jenkins-php
     depends_on:
       - database
-    environment:
-      XDEBUG_CLIENT_HOST: 127.17.0.1
-      XDEBUG_CLIENT_PORT: 9003
-      PHP_IDE_CONFIG: serverName=ogcore
     volumes:
       - ogpublic:/var/www/html/public
       - /opt/opengnsys/ogCore/etc/.env:/var/www/html/.env
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8a5bd62..b6c7909 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -39,10 +39,6 @@ services:
       - ./:/var/www/html
     depends_on:
       - database
-    environment:
-      XDEBUG_CLIENT_HOST: 127.17.0.1
-      XDEBUG_CLIENT_PORT: 9003
-      PHP_IDE_CONFIG: serverName=ogcore
     networks:
       - ogcore-network
 
diff --git a/docker/Dockerfile-php b/docker/Dockerfile-php
index a4cdcb8..e8be930 100644
--- a/docker/Dockerfile-php
+++ b/docker/Dockerfile-php
@@ -19,15 +19,6 @@ ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/do
 RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions sockets
 
-# Add xdebug
-RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS
-RUN apk add --update linux-headers
-RUN pecl install xdebug
-RUN docker-php-ext-enable xdebug
-RUN apk del -f .build-deps
-
-COPY ./docker/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
-
 # Generate SSH keys
 RUN ssh-keygen -t rsa -b 4096 -f /root/.ssh/id_rsa -N ""