diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4343afd31d..c90f9279eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -212,16 +212,17 @@ jobs:
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
       
       - name: Build Docker image
-        uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.3.1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: .
           file: build.Dockerfile
+          load: true
           platforms: |
             linux/amd64,
             linux/arm/v7,
             linux/arm64/v8
-          push: false
-          tags: bitwarden-build
+          # push: false
+          tags: bitwarden-build:latest
           # secrets: |
           #   "GH_PAT=${{ steps.retrieve-secret-pat.outputs.github-pat-bitwarden-devops-bot-repo-scope }}"
 
@@ -342,7 +343,7 @@ jobs:
         run: echo "name=${_AZ_REGISTRY}/${PROJECT_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT
 
       - name: Build Docker image
-        uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.3.1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: .
           file: ${{ matrix.base_path }}/${{ matrix.project_name }}/Dockerfile
diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile
index f6c1a50439..5b35da5870 100644
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM bitwarden-build AS bitwarden-build
+FROM --platform=$BUILDPLATFORM bitwarden-build:latest AS bitwarden-build
 
 ###############################################
 #                  App stage                  #