diff --git a/.github/workflows/reusable-auto-pull-request-create.yml b/.github/workflows/reusable-auto-pull-request-create.yml
index 9757edb..8838fa5 100644
--- a/.github/workflows/reusable-auto-pull-request-create.yml
+++ b/.github/workflows/reusable-auto-pull-request-create.yml
@@ -204,27 +204,26 @@ jobs:
 
   e2e-action-commit-push:
     if: inputs.profile == 'actions' && github.event.repository.name == 'action-commit-push'
-    needs: [pull-request]
+    needs: [docker]
     permissions:
       contents: write
     uses: devops-infra/triglav/.github/workflows/e2e-action-commit-push.yml@master
     with:
-      mode: ref
-      image_tag: ''
-      action_ref: ${{ github.sha }}
+      mode: image
+      image_tag: ${{ needs.docker.outputs.image_tag }}
     secrets: inherit
 
   e2e-action-pull-request:
     if: inputs.profile == 'actions' && github.event.repository.name == 'action-pull-request'
-    needs: [pull-request]
+    needs: [docker]
     permissions:
       contents: write
       pull-requests: write
       issues: write
     uses: devops-infra/triglav/.github/workflows/e2e-action-pull-request.yml@master
     with:
-      mode: ref
-      image_tag: ''
+      mode: image
+      image_tag: ${{ needs.docker.outputs.image_tag }}
     secrets: inherit
 
   e2e-action-container-structure-test:
diff --git a/.github/workflows/reusable-auto-release-create.yml b/.github/workflows/reusable-auto-release-create.yml
index 2897700..739b294 100644
--- a/.github/workflows/reusable-auto-release-create.yml
+++ b/.github/workflows/reusable-auto-release-create.yml
@@ -305,9 +305,8 @@ jobs:
       contents: write
     uses: devops-infra/triglav/.github/workflows/e2e-action-commit-push.yml@master
     with:
-      mode: ref
-      image_tag: ''
-      action_ref: ${{ github.sha }}
+      mode: image
+      image_tag: ${{ needs.release.outputs.release_version }}
     secrets: inherit
 
   publish-action-commit-push-release:
@@ -417,9 +416,8 @@ jobs:
       issues: write
     uses: devops-infra/triglav/.github/workflows/e2e-action-pull-request.yml@master
     with:
-      mode: ref
-      action_ref: ${{ github.sha }}
-      image_tag: ''
+      mode: image
+      image_tag: ${{ needs.release.outputs.release_version }}
     secrets: inherit
 
   publish-action-pull-request-release:
diff --git a/.github/workflows/reusable-manual-release-branch-prepare.yml b/.github/workflows/reusable-manual-release-branch-prepare.yml
index 9c83bc8..b089821 100644
--- a/.github/workflows/reusable-manual-release-branch-prepare.yml
+++ b/.github/workflows/reusable-manual-release-branch-prepare.yml
@@ -291,9 +291,8 @@ jobs:
       contents: write
     uses: devops-infra/triglav/.github/workflows/e2e-action-commit-push.yml@master
     with:
-      mode: ref
-      image_tag: ''
-      action_ref: release/${{ needs.prepare.outputs.version }}
+      mode: image
+      image_tag: ${{ needs.prepare.outputs.version }}-rc
     secrets: inherit
 
   e2e-action-pull-request:
@@ -305,9 +304,8 @@ jobs:
       issues: write
     uses: devops-infra/triglav/.github/workflows/e2e-action-pull-request.yml@master
     with:
-      mode: ref
-      action_ref: release/${{ needs.prepare.outputs.version }}
-      image_tag: ''
+      mode: image
+      image_tag: ${{ needs.prepare.outputs.version }}-rc
     secrets: inherit
 
   e2e-action-container-structure-test: