diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
index d1ea0b7..739255e 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: 
+on:
   push:
     branches: '**'
     tags: '**'
@@ -34,7 +34,6 @@ jobs:
         sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
         sed -i -- 's/YAML=true/YAML=false/g' .env
         sed -i -- 's/MSSQL=true/MSSQL=false/g' .env
-        sed -i -- 's/AMQP=true/AMQP=false/g' .env
         sed -i -- 's/MEMCACHED=true/MEMCACHED=false/g' .env
         sed -i -- 's/OCI8=true/OCI8=false/g' .env
         sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 06fbcdf..ce72bbd 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -381,7 +381,7 @@ ARG INSTALL_AMQP=false
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     # download and install manually, to make sure it's compatible with ampq installed by pecl later
     # install cmake first
-    apt-get -y install cmake && \
+    apt-get -yqq install cmake && \
     curl -L -o /tmp/rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/master.tar.gz && \
     mkdir -p rabbitmq-c && \
     tar -C rabbitmq-c -zxvf /tmp/rabbitmq-c.tar.gz --strip 1 && \
@@ -390,7 +390,11 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
     cmake .. && \
     cmake --build . --target install && \
     # Install the amqp extension
-    pecl install amqp && \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+      printf "\n" | pecl install amqp-1.11.0beta; \
+    else \
+      printf "\n" | pecl install amqp; \
+    fi && \
     docker-php-ext-enable amqp && \
     # Install the sockets extension
     docker-php-ext-install sockets \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 0787b7e..80b3531 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -226,14 +226,20 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
    && make install \
 ;fi
 
-
 # Install AMQP:
 ARG INSTALL_AMQP=false
 
 RUN if [ ${INSTALL_AMQP} = true ]; then \
-    apk --update add rabbitmq-c rabbitmq-c-dev && \
-    pecl install amqp && \
+    apk del -q openssl openssl-dev && \
+    apk --update add -q rabbitmq-c rabbitmq-c-dev && \
+    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
+      printf "\n" | pecl install amqp-1.11.0beta; \
+    else \
+      printf "\n" | pecl install amqp; \
+    fi && \
     docker-php-ext-enable amqp && \
+    apk del -q rabbitmq-c-dev && \
+    apk add --update -q openssl openssl-dev && \
     docker-php-ext-install sockets \
 ;fi