diff --git a/.github/workflows/test_published_images.yml b/.github/workflows/test_published_images.yml
index 0081fbee..648a77f5 100644
--- a/.github/workflows/test_published_images.yml
+++ b/.github/workflows/test_published_images.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
-      TAG:
+      IMAGE_VERSION:
         required: true
       EXPECTED_HZ_VERSION:
         required: true
@@ -38,18 +38,25 @@ jobs:
           # TODO REMOVE
           set -x
 
-          variant="${{ matrix.variant }}"
-          jdk="${{ matrix.jdk }}"
           # TODO Make dynamic
-          #tag=${{ inputs.TAG }}
-          tag=5.5.0
           #expected_hz_version=${{ inputs.EXPECTED_HZ_VERSION }}
-          expected_hz_version=$tag
+          expected_hz_version=5.5.0
+          # VERSION_PARTS=("${{ inputs.IMAGE_VERSION }}")
+          VERSION_PARTS=("5.5.0")
 
+          if [[ -n "${{ matrix.variant }}" ]]; then
+            VERSION_PARTS+=("${{ matrix.variant }}")
+          fi
+
+          if [[ -n "${{ matrix.jdk }}" ]]; then
+            VERSION_PARTS+=("${{ matrix.jdk }}")
+          fi
+
+          IFS=- ; IMAGE_TAG="${VERSION_PARTS[*]}"
 
           function simple-smoke-test() {
             local organization=$1
-            .github/scripts/simple-smoke-test.sh ${organization}/${image_name}:${TAG}${variant:+-$variant}${jdk:+-$jdk} ${CONTAINER_NAME} ${{ matrix.distribution_type }} ${expected_hz_version}
+            .github/scripts/simple-smoke-test.sh ${organization}/${image_name}:${image_tag} ${CONTAINER_NAME} ${{ matrix.distribution_type }} ${expected_hz_version}
           }
 
           case "${{ matrix.distribution_type }}" in