diff --git a/README.md b/README.md
index defbc68..f9ef75d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Pipes](https://github.com/mobtitude/docker-php-xdebug/actions/workflows/pipes.yaml/badge.svg)](https://github.com/mobtitude/docker-php-xdebug/actions/workflows/pipes.yaml)
+
 About this repo
 ===============
 This repository contains Dockerfiles to build PHP images with `xdebug` installed and configured to run with modern IDEs like phpStorm.
diff --git a/build/8.1-apache/xdebug.ini b/build/8.1-apache/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.1-apache/xdebug.ini
+++ b/build/8.1-apache/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.1-cli/xdebug.ini b/build/8.1-cli/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.1-cli/xdebug.ini
+++ b/build/8.1-cli/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.1-fpm/xdebug.ini b/build/8.1-fpm/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.1-fpm/xdebug.ini
+++ b/build/8.1-fpm/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.2-apache/xdebug.ini b/build/8.2-apache/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.2-apache/xdebug.ini
+++ b/build/8.2-apache/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.2-cli/xdebug.ini b/build/8.2-cli/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.2-cli/xdebug.ini
+++ b/build/8.2-cli/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.2-fpm/xdebug.ini b/build/8.2-fpm/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.2-fpm/xdebug.ini
+++ b/build/8.2-fpm/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.3-apache/xdebug.ini b/build/8.3-apache/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.3-apache/xdebug.ini
+++ b/build/8.3-apache/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.3-cli/xdebug.ini b/build/8.3-cli/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.3-cli/xdebug.ini
+++ b/build/8.3-cli/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.3-fpm/xdebug.ini b/build/8.3-fpm/xdebug.ini
index a6c56ff..b04f78c 100644
--- a/build/8.3-fpm/xdebug.ini
+++ b/build/8.3-fpm/xdebug.ini
@@ -1,13 +1,14 @@
 [xdebug]
 zend_extension=xdebug.so
 
-xdebug.cli_color=1
-xdebug.mode=debug
+xdebug.cli_color=0
+xdebug.show_local_vars=1
 xdebug.start_with_request=trigger
-xdebug.trigger_value=StartXDebug
 
 xdebug.output_dir="/tmp"
 xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
 
-xdebug.discover_client_host=true
-xdebug.client_port=9003
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/src/xdebug-2.ini b/src/xdebug-2.ini
deleted file mode 100644
index 94ea677..0000000
--- a/src/xdebug-2.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[xdebug]
-zend_extension=xdebug.so
-
-xdebug.cli_color=1
-xdebug.profiler_enable=0
-xdebug.profiler_enable_trigger=1
-
-xdebug.profiler_output_dir="/tmp"
-xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
-
-xdebug.remote_enable=1
-xdebug.remote_connect_back=1
-xdebug.remote_port=9000