diff --git a/images/php/cli/Dockerfile b/images/php/cli/Dockerfile
index 3e9d88a043..2fa67f2300 100644
--- a/images/php/cli/Dockerfile
+++ b/images/php/cli/Dockerfile
@@ -5,9 +5,7 @@ FROM ${IMAGE_REPO:-lagoon}/php:${PHP_VERSION}-fpm
 LABEL maintainer="amazee.io"
 ENV LAGOON=cli
 
-RUN apk update \
-    && apk upgrade \
-    && apk add git \
+RUN apk add --no-cache git \
         mysql-client \
         unzip \
         gzip  \
@@ -20,7 +18,7 @@ RUN apk update \
         coreutils \
         postgresql-client \
         openssh-sftp-server \
-    && apk add nodejs-current nodejs-npm yarn --update-cache --force-overwrite --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \
+    && apk add --no-cache nodejs-current nodejs-npm yarn --force-overwrite --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \
     && rm -rf /var/cache/apk/* \
     && curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/1.8.4/composer.phar \
diff --git a/images/php/fpm/Dockerfile b/images/php/fpm/Dockerfile
index 916a1227e1..3f9980ca3b 100644
--- a/images/php/fpm/Dockerfile
+++ b/images/php/fpm/Dockerfile
@@ -33,9 +33,7 @@ COPY ssmtp.conf /etc/ssmtp/ssmtp.conf
 
 ENV NEWRELIC_VERSION=8.1.0.209
 
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache fcgi \
+RUN apk add --no-cache fcgi \
         ssmtp \
         libzip libzip-dev \
         # for gd
diff --git a/services/broker/Dockerfile b/services/broker/Dockerfile
index aa687d0667..263ce3806d 100644
--- a/services/broker/Dockerfile
+++ b/services/broker/Dockerfile
@@ -1,2 +1,2 @@
 ARG IMAGE_REPO
-FROM ${IMAGE_REPO:-lagoon}/rabbitmq-cluster
+FROM ${IMAGE_REPO:-lagoon}/rabbitmq