diff --git a/.github/actions/get-configuration/action.yml b/.github/actions/get-configuration/action.yml
index 1be91d27f6..d9f357f8d0 100644
--- a/.github/actions/get-configuration/action.yml
+++ b/.github/actions/get-configuration/action.yml
@@ -34,7 +34,7 @@ runs:
         echo "k3d_version=5.7.4" >> $GITHUB_OUTPUT
         echo "modulectl_version=1.1.3" >> $GITHUB_OUTPUT
         echo "cert_manager_version=1.15.0" >> $GITHUB_OUTPUT
-        echo "klm_version_tag=${{ github.event.inputs.image_tag || format('PR-{0}', github.event.pull_request.number) }}" >> $GITHUB_OUTPUT
+        echo "klm_version_tag=PR-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
         echo "klm_image_repo=dev" >> $GITHUB_OUTPUT
     - name: Expose environment variables
       shell: bash
diff --git a/.github/workflows/test-e2e-with-modulereleasemeta.yml b/.github/workflows/test-e2e-with-modulereleasemeta.yml
index defdf57407..d81b26e467 100644
--- a/.github/workflows/test-e2e-with-modulereleasemeta.yml
+++ b/.github/workflows/test-e2e-with-modulereleasemeta.yml
@@ -5,9 +5,6 @@ env:
 on:
   workflow_dispatch:
     inputs:
-      image_tag:
-        description: With image tag for KLM image
-        required: true
       k8s_version:
         description: With Kubernetes version
         required: false
@@ -27,7 +24,7 @@ jobs:
         env:
           ITERATIONS: 40
           SLEEP_SECONDS: 30
-        run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.inputs.image_tag || github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
+        run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
   e2e-integration:
     name: E2E With ModuleReleaseMeta
     needs: wait-for-image-build
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index c56986bc20..6d11ae881a 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -5,11 +5,8 @@ env:
 on:
   workflow_dispatch:
     inputs:
-      image_tag:
-        description: "With image tag for KLM image (format: PR-XXX or full commit SHA)"
-        required: true
       k8s_version:
-        description: "With Kubernetes version (format: x.y.z)"
+        description: With Kubernetes version
         required: false
   pull_request:
     types: [ opened, edited, synchronize, reopened, ready_for_review ]
@@ -27,7 +24,7 @@ jobs:
         env:
           ITERATIONS: 40
           SLEEP_SECONDS: 30
-        run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.inputs.image_tag || github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
+        run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
   e2e-integration:
     name: E2E
     needs: wait-for-image-build