diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b937d5d25..7ace23d7c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -272,6 +272,11 @@ jobs:
     runs-on: ubuntu-22.04
     # needs:
     #   - build
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     strategy:
       fail-fast: false
       matrix:
@@ -346,14 +351,20 @@ jobs:
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
-      - name: Retrieve Storage Account secret
-        id: retrieve-secret
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "storage-account-dockerimagetest-conn-string"
-
       ########## Generate image tag and build Docker image ##########
+      - name: Build Docker image
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          context: .
+          file: build.Dockerfile
+          platforms: |
+            linux/amd64,
+            linux/arm/v7,
+            linux/arm64
+          push: true
+          outputs: type=oci,dest=/tmp/build.tar
+          tags: localhost:5000/build:latest
+
       - name: Generate Docker image tag
         id: tag
         run: |
@@ -378,20 +389,6 @@ jobs:
           PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
         run: echo "name=${_AZ_REGISTRY}/${PROJECT_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT
 
-      - name: Download build image artifact
-        run: |
-          az storage blob download \
-            --file /tmp/build.tar \
-            --container-name builds \
-            --name build \
-            --connection-string '${{ env.storage-account-dockerimagetest-conn-string }}'
-          ls -alh /tmp
-
-      - name: Load build image
-        run: |
-          docker load --input /tmp/build.tar
-          docker image ls -a
-
       - name: Build Docker image
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
diff --git a/bitwarden_license/src/Scim/Dockerfile b/bitwarden_license/src/Scim/Dockerfile
index 0d85d8a284..969c4855c7 100644
--- a/bitwarden_license/src/Scim/Dockerfile
+++ b/bitwarden_license/src/Scim/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/bitwarden_license/src/Sso/Dockerfile b/bitwarden_license/src/Sso/Dockerfile
index 0aad4442c0..31241acb11 100644
--- a/bitwarden_license/src/Sso/Dockerfile
+++ b/bitwarden_license/src/Sso/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile
index 07830a30b4..537b615156 100644
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile
index 1a558c8e5d..496db58cd8 100644
--- a/src/Api/Dockerfile
+++ b/src/Api/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile
index a0d9b16367..ebed93b8dd 100644
--- a/src/Billing/Dockerfile
+++ b/src/Billing/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile
index b4f5bc3a03..7b1df8467d 100644
--- a/src/Events/Dockerfile
+++ b/src/Events/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/EventsProcessor/Dockerfile b/src/EventsProcessor/Dockerfile
index ede264a2be..1ab3c727e2 100644
--- a/src/EventsProcessor/Dockerfile
+++ b/src/EventsProcessor/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile
index f5e578f532..6bc21ffd4b 100644
--- a/src/Icons/Dockerfile
+++ b/src/Icons/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index 8c52c8420a..7821c32a04 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile
index 3ca5c3ae53..0a02a14dee 100644
--- a/src/Notifications/Dockerfile
+++ b/src/Notifications/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/util/Attachments/Dockerfile b/util/Attachments/Dockerfile
index 5c2b48c1f6..51837dc455 100644
--- a/util/Attachments/Dockerfile
+++ b/util/Attachments/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/util/Server/Dockerfile b/util/Server/Dockerfile
index e6380d5f00..4e425d2111 100644
--- a/util/Server/Dockerfile
+++ b/util/Server/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index 2045d52de9..4901b59f15 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -2,7 +2,7 @@
 #                 Build stage                 #
 ###############################################
 ARG BUILD_TAG=latest
-FROM --platform=$BUILDPLATFORM build:${BUILD_TAG} AS bitwarden-build
+FROM --platform=$BUILDPLATFORM localhost:5000/build:${BUILD_TAG} AS bitwarden-build
 
 ###############################################
 #                  App stage                  #