diff --git a/.github/workflows/publish-simple.yaml b/.github/workflows/publish-simple.yaml
index 94b25f5..e0f7a4d 100644
--- a/.github/workflows/publish-simple.yaml
+++ b/.github/workflows/publish-simple.yaml
@@ -17,6 +17,12 @@ jobs:
       contents: read
       packages: write
 
+    strategy:
+      matrix:
+        variant:
+          - zephyr_version: "v3.6.0"
+            mcuboot_version: "a4eda30f5b0cfd0cf15512be9dcd559239dbfc91"
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -36,13 +42,13 @@ jobs:
         id: meta-ci
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ci
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci
 
       - name: Extract metadata for Dev image
         id: meta-dev
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-dev
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-dev
 
       - name: Build and push CI image
         id: push-ci
@@ -63,7 +69,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           file: Dockerfile
-          # file: ./vanilla-zephyr/Dockerfile.ci
+          # file: ./vanilla-zephyr/Dockerfile.dev
           # platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta-dev.outputs.tags }}