diff --git a/.ansible/group_vars/all/mods.yml b/.ansible/group_vars/all/mods.yml
index c132fd9..074eef9 100644
--- a/.ansible/group_vars/all/mods.yml
+++ b/.ansible/group_vars/all/mods.yml
@@ -1517,17 +1517,15 @@ extensions_available:
     disabled: []
     all:
       type: pecl
-    8.2:
-      type: git
-      git_url: https://github.com/xdebug/xdebug
-      # FIXME: revert to latest tag once PHP 8.2 support is out of alpha/beta
-      git_ref: 3.2.0RC2
-      configure: --enable-xdebug
-    8.1:
-      type: git
-      git_url: https://github.com/xdebug/xdebug
-      git_ref: $(git tag | grep -E '^[.0-9]+$' | sort -V | tail -1)
-      configure: --enable-xdebug
+    7.4:
+      type: pecl
+      version: 3.1.6
+    7.3:
+      type: pecl
+      version: 3.1.6
+    7.2:
+      type: pecl
+      version: 3.1.6
     7.1:
       type: pecl
       version: 2.9.8
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
index 75a9eea..bc9e0c8 100644
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -844,10 +844,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install xdebug \
+	&& pecl install xdebug-3.1.6 \
 	# Enabling
 	&& docker-php-ext-enable xdebug \
 	&& true
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
index 1a11217..b216f95 100644
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -838,10 +838,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install xdebug \
+	&& pecl install xdebug-3.1.6 \
 	# Enabling
 	&& docker-php-ext-enable xdebug \
 	&& true
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
index 5013c12..123db6e 100644
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -825,10 +825,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install xdebug \
+	&& pecl install xdebug-3.1.6 \
 	# Enabling
 	&& docker-php-ext-enable xdebug \
 	&& true
diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1
index 4a2e8c6..a03f5b8 100644
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -787,17 +787,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
-	&& cd /tmp/xdebug \
-	# Custom:       Branch
-	&& git checkout $(git tag | grep -E '^[.0-9]+$' | sort -V | tail -1) \
-	# Default:      Install command
-	&& phpize \
-	&& ./configure  --enable-xdebug \
-	&& make -j$(getconf _NPROCESSORS_ONLN) \
-	&& make install \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install xdebug \
 	# Enabling
 	&& docker-php-ext-enable xdebug \
 	&& true
diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2
index fd330e1..4aa6c43 100644
--- a/Dockerfiles/mods/Dockerfile-8.2
+++ b/Dockerfiles/mods/Dockerfile-8.2
@@ -739,17 +739,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/xdebug/xdebug /tmp/xdebug \
-	&& cd /tmp/xdebug \
-	# Custom:       Branch
-	&& git checkout 3.2.0RC2 \
-	# Default:      Install command
-	&& phpize \
-	&& ./configure  --enable-xdebug \
-	&& make -j$(getconf _NPROCESSORS_ONLN) \
-	&& make install \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install xdebug \
 	# Enabling
 	&& docker-php-ext-enable xdebug \
 	&& true
diff --git a/php_modules/xdebug/build.yml b/php_modules/xdebug/build.yml
index 977be01..2f22818 100644
--- a/php_modules/xdebug/build.yml
+++ b/php_modules/xdebug/build.yml
@@ -8,18 +8,17 @@
 all:
   type: pecl
 
-8.2:
-  type: git
-  git_url: https://github.com/xdebug/xdebug
-  # FIXME: revert to latest tag once PHP 8.2 support is out of alpha/beta
-  git_ref: 3.2.0RC2
-  configure: --enable-xdebug
+7.4:
+  type: pecl
+  version: 3.1.6
 
-8.1:
-  type: git
-  git_url: https://github.com/xdebug/xdebug
-  git_ref: $(git tag | grep -E '^[.0-9]+$' | sort -V | tail -1)
-  configure: --enable-xdebug
+7.3:
+  type: pecl
+  version: 3.1.6
+
+7.2:
+  type: pecl
+  version: 3.1.6
 
 7.1:
   type: pecl