diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile
index 31aff6b..3e01670 100644
--- a/php/7.4/Dockerfile
+++ b/php/7.4/Dockerfile
@@ -15,14 +15,15 @@ ENV PHP_POST_MAX_SIZE=50M
 ENV PHP_UPLOAD_MAX_FILESIZE=50M
 
 # XDebug Env Variables
-ENV XDEBUG_MODE=develop,debug
+ENV XDEBUG_MODE=debug
 ENV XDEBUG_START_WITH_REQUEST=yes
-ENV XDEBUG_DISCOVER_CLIENT_HOST=0
+ENV XDEBUG_DISCOVER_CLIENT_HOST=1
 ENV XDEBUG_CLIENT_HOST=host.docker.internal
 ENV XDEBUG_CLIENT_PORT=9003
 ENV XDEBUG_MAX_NESTING_LEVEL=1500
 ENV XDEBUG_IDE_KEY=PHPSTORM
 ENV XDEBUG_LOG=/tmp/xdebug.log
+ENV PHP_IDE_CONFIG="serverName=_"
 
 # Versioning Env Vars
 ENV XDEBUG_VERSION=3.0.2
diff --git a/php/7.4/entrypoint.sh b/php/7.4/entrypoint.sh
index 689340c..fcc7910 100644
--- a/php/7.4/entrypoint.sh
+++ b/php/7.4/entrypoint.sh
@@ -16,7 +16,7 @@ sed -i "s:upload_max_filesize.*:upload_max_filesize = $PHP_UPLOAD_MAX_FILESIZE:g
 echo "xdebug.mode=$XDEBUG_MODE" >> $xdebugIniFile
 echo "xdebug.cli_color=1" >> $xdebugIniFile
 echo "xdebug.start_with_request = $XDEBUG_START_WITH_REQUEST" >> $xdebugIniFile
-echo "xdebug.xdebug.discover_client_host = $XDEBUG_DISCOVER_CLIENT_HOST" >> $xdebugIniFile
+echo "xdebug.discover_client_host = $XDEBUG_DISCOVER_CLIENT_HOST" >> $xdebugIniFile
 echo "xdebug.client_host = $XDEBUG_CLIENT_HOST" >> $xdebugIniFile
 echo "xdebug.client_port = $XDEBUG_CLIENT_PORT" >> $xdebugIniFile
 echo "xdebug.idekey = $XDEBUG_IDE_KEY" >> $xdebugIniFile
diff --git a/php/8.0/Dockerfile b/php/8.0/Dockerfile
index 99bd3a9..2d52a00 100644
--- a/php/8.0/Dockerfile
+++ b/php/8.0/Dockerfile
@@ -15,14 +15,15 @@ ENV PHP_POST_MAX_SIZE=50M
 ENV PHP_UPLOAD_MAX_FILESIZE=50M
 
 # XDebug Env Variables
-ENV XDEBUG_MODE=develop,debug
+ENV XDEBUG_MODE=debug
 ENV XDEBUG_START_WITH_REQUEST=yes
-ENV XDEBUG_DISCOVER_CLIENT_HOST=0
+ENV XDEBUG_DISCOVER_CLIENT_HOST=1
 ENV XDEBUG_CLIENT_HOST=host.docker.internal
 ENV XDEBUG_CLIENT_PORT=9003
 ENV XDEBUG_MAX_NESTING_LEVEL=1500
 ENV XDEBUG_IDE_KEY=PHPSTORM
 ENV XDEBUG_LOG=/tmp/xdebug.log
+ENV PHP_IDE_CONFIG="serverName=_"
 
 # Versioning Env Vars
 ENV XDEBUG_VERSION=3.0.2
diff --git a/php/8.0/entrypoint.sh b/php/8.0/entrypoint.sh
index 689340c..fcc7910 100644
--- a/php/8.0/entrypoint.sh
+++ b/php/8.0/entrypoint.sh
@@ -16,7 +16,7 @@ sed -i "s:upload_max_filesize.*:upload_max_filesize = $PHP_UPLOAD_MAX_FILESIZE:g
 echo "xdebug.mode=$XDEBUG_MODE" >> $xdebugIniFile
 echo "xdebug.cli_color=1" >> $xdebugIniFile
 echo "xdebug.start_with_request = $XDEBUG_START_WITH_REQUEST" >> $xdebugIniFile
-echo "xdebug.xdebug.discover_client_host = $XDEBUG_DISCOVER_CLIENT_HOST" >> $xdebugIniFile
+echo "xdebug.discover_client_host = $XDEBUG_DISCOVER_CLIENT_HOST" >> $xdebugIniFile
 echo "xdebug.client_host = $XDEBUG_CLIENT_HOST" >> $xdebugIniFile
 echo "xdebug.client_port = $XDEBUG_CLIENT_PORT" >> $xdebugIniFile
 echo "xdebug.idekey = $XDEBUG_IDE_KEY" >> $xdebugIniFile