diff --git a/.github/workflows/public-docker-image.yml b/.github/workflows/public-docker-image.yml
index 692f5c52..696a2b92 100644
--- a/.github/workflows/public-docker-image.yml
+++ b/.github/workflows/public-docker-image.yml
@@ -18,6 +18,22 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      # All-in-one Image Steps
+      - name: Extract metadata (tags, labels) for All-in-one Docker
+        id: meta_all_in_one
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: daveearley/hi.events-all-in-one
+
+      - name: Build and push All-in-one Docker image
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          context: ./
+          file: ./Dockerfile.all-in-one
+          push: true
+          tags: ${{ steps.meta_all_in_one.outputs.tags }}
+          labels: ${{ steps.meta_all_in_one.outputs.labels }}
+
       # Backend Image Steps
       - name: Extract metadata (tags, labels) for Backend Docker
         id: meta_backend
@@ -48,20 +64,4 @@ jobs:
           file: ./frontend/Dockerfile.ssr
           push: true
           tags: ${{ steps.meta_frontend.outputs.tags }}
-          labels: ${{ steps.meta_frontend.outputs.labels }}
-
-      # All-in-one Image Steps
-      - name: Extract metadata (tags, labels) for All-in-one Docker
-        id: meta_all_in_one
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: daveearley/hi.events-all-in-one
-
-      - name: Build and push All-in-one Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
-        with:
-          context: ./
-          file: ./Dockerfile.all-in-one
-          push: true
-          tags: ${{ steps.meta_all_in_one.outputs.tags }}
-          labels: ${{ steps.meta_all_in_one.outputs.labels }}
+          labels: ${{ steps.meta_frontend.outputs.labels }}
\ No newline at end of file