diff --git a/.github/workflows/container-build-and-test.yml b/.github/workflows/container-build-and-test.yml
index de25ab72cb7..3a178baa608 100644
--- a/.github/workflows/container-build-and-test.yml
+++ b/.github/workflows/container-build-and-test.yml
@@ -5,6 +5,9 @@ on:
     branches:
     - master
 
+env:
+  IMAGE_NAME: troysnyk/snyk-juice-shop
+
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -12,23 +15,31 @@ jobs:
         - name: Checkout Repo
           uses: actions/checkout@master
 
-        # - name: Set up QEMU
-        #   uses: docker/setup-qemu-action@v3
+        - name: Set up QEMU
+          uses: docker/setup-qemu-action@v3
+
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
 
-        # - name: Set up Docker Buildx
-        #   uses: docker/setup-buildx-action@v3
+        - name: Login to Docker Hub
+          uses: docker/login-action@v3
+          with:
+            username: ${{ secrets.DOCKERHUB_USERNAME }}
+            password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-        # - name: Login to Docker Hub
-        #   uses: docker/login-action@v3
-        #   with:
-        #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-        #     password: ${{ secrets.DOCKERHUB_TOKEN }}
+        - name: Extract metadata
+          id: meta
+          uses: docker/metadata-action@v5
+          with:
+            images: ${{ env.IMAGE_NAME }}
+            tags: linux
 
-        # - name: Build and push
-        #   uses: docker/build-push-action@v5
-        #   with:
-        #     push: true
-            # tags: troysnyk/snyk-juice-shop:linux
+        - name: Build and push
+          uses: docker/build-push-action@v6
+          with:
+            push: true
+            provenance: mode=max
+            tags: ${{ steps.meta.outputs.tags }}
 
         - uses: snyk/actions/setup@master
         - name: Snyk Container Monitor