diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 5caf234..e6111fb 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -22,8 +22,8 @@ Once that draft release has been created, you have to:
 
 ### amqp
 
-For PHP 8+ we currenly install the `amqp` PHP extension from a specific git commit.
-We should switch to the normal pecl/pickle approach when we have a new release.
+For PHP 8+ we currenly install the `amqp` PHP extension with the `beta` stability.
+We should switch to `stable` when it will be available.
 
 ### cmark
 
diff --git a/data/supported-extensions b/data/supported-extensions
index 30f1aab..a8710c0 100644
--- a/data/supported-extensions
+++ b/data/supported-extensions
@@ -1,4 +1,4 @@
-amqp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
+amqp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
 apcu 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 apcu_bc 7.0 7.1 7.2 7.3 7.4
 ast 7.0 7.1 7.2 7.3 7.4 8.0
diff --git a/install-php-extensions b/install-php-extensions
index 09e156d..1be17a2 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -1546,16 +1546,7 @@ installRemoteModule() {
 		amqp)
 			if test -z "$installRemoteModule_version"; then
 				if test $PHP_MAJMIN_VERSION -ge 800; then
-					if test -z "$installRemoteModule_version"; then
-						installRemoteModule_version=df1241852b359cf12c346beaa68de202257efdf1
-					fi
-					installRemoteModule_src="$(getPackageSource https://codeload.github.com/php-amqp/php-amqp/tar.gz/$installRemoteModule_version)"
-					cd -- "$installRemoteModule_src"
-					phpize
-					./configure
-					make -j$(getProcessorCount)
-					make install
-					installRemoteModule_manuallyInstalled=1
+					installRemoteModule_version=beta
 				elif test "$DISTRO_VERSION" = debian@8; then
 					# in Debian Jessie we have librammitmq version 0.5.2
 					installRemoteModule_version=1.9.3