diff --git a/.github/workflows/build-clamav-image.yml b/.github/workflows/build-clamav-image.yml
index a3d81d7bd..66a09da85 100644
--- a/.github/workflows/build-clamav-image.yml
+++ b/.github/workflows/build-clamav-image.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-and-push-image:
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-multiarch-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
       ecrRepositoryName: clamav
diff --git a/.github/workflows/build-mongodb-image.yml b/.github/workflows/build-mongodb-image.yml
index 4eea187e9..09ac99210 100644
--- a/.github/workflows/build-mongodb-image.yml
+++ b/.github/workflows/build-mongodb-image.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-and-push-image:
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-multiarch-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
       ecrRepositoryName: mongodb
diff --git a/.github/workflows/build-toolbox-image.yml b/.github/workflows/build-toolbox-image.yml
index 055bd6d62..e5e7afa08 100644
--- a/.github/workflows/build-toolbox-image.yml
+++ b/.github/workflows/build-toolbox-image.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-and-push-image:
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-multiarch-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
       ecrRepositoryName: toolbox
diff --git a/images/clamav/Dockerfile b/images/clamav/Dockerfile
index bd2b4f451..75f6a97af 100644
--- a/images/clamav/Dockerfile
+++ b/images/clamav/Dockerfile
@@ -1,4 +1,4 @@
-FROM clamav/clamav-debian:1.2
+FROM --platform=$TARGETPLATFORM clamav/clamav-debian:1.2
 
 COPY "./images/clamav/scripts/unprivileged-entrypoint.sh" "/unpriv-init"
 
diff --git a/images/mongodb/Dockerfile b/images/mongodb/Dockerfile
index 0c0bd3115..8b4cdfcfc 100644
--- a/images/mongodb/Dockerfile
+++ b/images/mongodb/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lts/ubuntu:22.04
+FROM --platform=$TARGETPLATFORM public.ecr.aws/lts/ubuntu:22.04
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
 ENV MONGO_VERSION 2.6.12
diff --git a/images/toolbox/Dockerfile b/images/toolbox/Dockerfile
index 381fbf548..3fce37140 100644
--- a/images/toolbox/Dockerfile
+++ b/images/toolbox/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lts/ubuntu:22.04
+FROM --platform=$TARGETPLATFORM public.ecr.aws/lts/ubuntu:22.04
 ARG TARGETARCH
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]