diff --git a/.github/workflows/container-build-and-test.yml b/.github/workflows/container-build-and-test.yml
index e315bc00005..3c04ff17c2f 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:linux
+
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -24,11 +27,18 @@ jobs:
             username: ${{ secrets.DOCKERHUB_USERNAME }}
             password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+        - name: Extract metadata
+          id: meta
+          uses: docker/metadata-action@v5
+          with:
+            images: ${{ env.IMAGE_NAME }}
+
         - name: Build and push
-          uses: docker/build-push-action@v5
+          uses: docker/build-push-action@v6
           with:
             push: true
-            tags: troysnyk/snyk-juice-shop:linux
+            provenance: mode=max
+            ags: ${{ steps.meta.outputs.tags }}
 
         - uses: snyk/actions/setup@master
         - name: Snyk Container Monitor