diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
index 616ae4b1..a378ded6 100644
--- a/workspace/Dockerfile-56
+++ b/workspace/Dockerfile-56
@@ -233,12 +233,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/5.6/mods-available/amqp.ini && \
     ln -s /etc/php/5.6/mods-available/amqp.ini /etc/php/5.6/cli/conf.d/30-amqp.ini \
diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70
index 6cd2a3d5..4afa0f9a 100644
--- a/workspace/Dockerfile-70
+++ b/workspace/Dockerfile-70
@@ -229,12 +229,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/7.0/mods-available/amqp.ini && \
     ln -s /etc/php/7.0/mods-available/amqp.ini /etc/php/7.0/cli/conf.d/30-amqp.ini \
diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
index 1348914e..1865d266 100644
--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@@ -225,12 +225,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/7.1/mods-available/amqp.ini && \
     ln -s /etc/php/7.1/mods-available/amqp.ini /etc/php/7.1/cli/conf.d/30-amqp.ini \
diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72
index 80976325..abbaf5f8 100644
--- a/workspace/Dockerfile-72
+++ b/workspace/Dockerfile-72
@@ -225,12 +225,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/7.2/mods-available/amqp.ini && \
     ln -s /etc/php/7.2/mods-available/amqp.ini /etc/php/7.2/cli/conf.d/30-amqp.ini \