diff --git a/.github/workflows/vineyard-operator.yaml b/.github/workflows/vineyard-operator.yaml
index 5b385290..3045238e 100644
--- a/.github/workflows/vineyard-operator.yaml
+++ b/.github/workflows/vineyard-operator.yaml
@@ -297,11 +297,8 @@ jobs:
       - name: Leave a message for logs URL
         if: ${{ failure() }}
         run: |
-          if [[ -n ${{ github.event.pull_request.head.sha }} ]]; then
-              short_sha=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})
-          else
-              short_sha=$(git rev-parse --short ${{ github.event.push.head.sha }})
-          fi
+          sha=${{ github.event.pull_request.head.sha || github.sha }}
+          short_sha=$(git rev-parse --short $sha)
           case ${{ matrix.job }} in
             e2e-tests-spill)
               signed_url_key=0707
diff --git a/k8s/test/e2e/autogenerated-helm-chart/e2e.yaml b/k8s/test/e2e/autogenerated-helm-chart/e2e.yaml
index d2e0f104..cd545260 100644
--- a/k8s/test/e2e/autogenerated-helm-chart/e2e.yaml
+++ b/k8s/test/e2e/autogenerated-helm-chart/e2e.yaml
@@ -27,7 +27,8 @@ setup:
         helm install vineyard-operator charts/vineyard-operator \
             --create-namespace \
             --namespace vineyard-system \
-            --set controllerManager.manager.image.repository=localhost:5001/vineyard-operator
+            --set controllerManager.manager.image.repository=localhost:5001/vineyard-operator \
+            --set controllerManager.manager.image.tag=latest
       wait:
         - namespace: vineyard-system
           resource: deployment/vineyard-operator-controller-manager