diff --git a/images/maas-rack-controller-jammy/Dockerfile b/images/maas-rack-controller-jammy/Dockerfile
index 214193c..fc37f43 100644
--- a/images/maas-rack-controller-jammy/Dockerfile
+++ b/images/maas-rack-controller-jammy/Dockerfile
@@ -18,7 +18,7 @@ ARG no_proxy
 ENV DEBIAN_FRONTEND=noninteractive
 ENV container=docker
 
-ENV MAAS_VERSION=3.5
+ENV MAAS_VERSION=1:3.5.8-16381-g.d7e999261-0ubuntu1~22.04.1
 
 RUN apt-get -qq update \
  && apt upgrade -y \
@@ -44,9 +44,9 @@ RUN apt-get -qq update \
          -exec rm \{} \; \
  && systemctl set-default multi-user.target \
 # Install maas from the ppa
- && add-apt-repository -yu ppa:maas/$MAAS_VERSION \
+ && add-apt-repository -yu ppa:maas/3.5 \
  && apt-get install -y \
-        maas-rack-controller \
+        maas-rack-controller=$MAAS_VERSION \
  && rm -rf /var/lib/apt/lists/*\
  && rm -f /etc/ssl/private/snakeoil.*
 
diff --git a/images/maas-rack-controller/Dockerfile b/images/maas-rack-controller/Dockerfile
index bb2d0db..a1a022c 100644
--- a/images/maas-rack-controller/Dockerfile
+++ b/images/maas-rack-controller/Dockerfile
@@ -18,7 +18,7 @@ ARG no_proxy
 ENV DEBIAN_FRONTEND noninteractive
 ENV container docker
 
-ENV MAAS_VERSION 2.8.7-8611-g.f2514168f-0ubuntu1~18.04.1
+ENV MAAS_VERSION=2.8.7-8611-g.f2514168f-0ubuntu1~18.04.1
 
 RUN apt-get -qq update \
  && apt-get install -y \
diff --git a/images/maas-region-controller-jammy/Dockerfile b/images/maas-region-controller-jammy/Dockerfile
index 8e3b6fa..0074d76 100644
--- a/images/maas-region-controller-jammy/Dockerfile
+++ b/images/maas-region-controller-jammy/Dockerfile
@@ -18,7 +18,7 @@ ARG no_proxy
 ENV DEBIAN_FRONTEND=noninteractive
 ENV container=docker
 
-ENV MAAS_VERSION=3.5
+ENV MAAS_VERSION=1:3.5.8-16381-g.d7e999261-0ubuntu1~22.04.1
 
 RUN apt-get -qq update \
  && apt upgrade -y \
@@ -43,9 +43,9 @@ RUN apt-get -qq update \
          -exec rm \{} \; \
  && systemctl set-default multi-user.target \
 # Install maas from the ppa
- && add-apt-repository -yu ppa:maas/$MAAS_VERSION \
+ && add-apt-repository -yu ppa:maas/3.5 \
  && apt-get install -y \
-        maas-region-api \
+        maas-region-api=$MAAS_VERSION \
         # tcpdump is required by /usr/lib/maas/beacon-monitor
         tcpdump \
  && rm -rf /var/lib/apt/lists/*\