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