diff --git a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml
index bcc1c2319e65..27bf8b1bcbda 100644
--- a/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml
+++ b/prow/jobs/kyma-project/eventing-manager/eventing-manager-generic.yaml
@@ -112,7 +112,7 @@ postsubmits: # runs on main
       cluster: trusted-workload
       max_concurrency: 10
       branches:
-        - ^\d+\.\d+\.\d+(?:-.*)?$
+        - ^\d+\.\d+\.\d+(?:-.*)?$ # Watches for new Tag
       spec:
         containers:
           - image: "eu.gcr.io/sap-kyma-neighbors-dev/image-builder:v20230313-8dfce5f0b"
@@ -128,7 +128,7 @@ postsubmits: # runs on main
               - "--config=/config/kaniko-build-config.yaml"
               - "--context=."
               - "--dockerfile=Dockerfile"
-              - "--tag={{ .Env \"PULL_BASE_SHA\" }}"
+              - "--tag={{ .Env \"PULL_BASE_REF\" }}"
             resources:
               requests:
                 memory: 1.5Gi
@@ -166,7 +166,9 @@ postsubmits: # runs on main
       cluster: trusted-workload
       max_concurrency: 10
       branches:
-        - ^\d+\.\d+\.\d+(?:-.*)?$
+        - ^\d+\.\d+\.\d+(?:-.*)?$ # Watches for new Tag
+      skip_branches:
+        - 0.0.0 # Skip for 0.0.0 Tag  
       spec:
         containers:
           - image: "europe-docker.pkg.dev/kyma-project/prod/testimages/buildpack-go:v20231206-59f0cdfa"
@@ -181,7 +183,7 @@ postsubmits: # runs on main
               - "ci"
             env:
               - name: IMG
-                value: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_SHA}"
+                value: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${PULL_BASE_REF}"
               - name: KUSTOMIZE_VERSION
                 value: "v4.5.6"
               - name: MODULE_REGISTRY
@@ -207,6 +209,8 @@ postsubmits: # runs on main
       skip_report: false
       decorate: true
       cluster: trusted-workload
+      skip_branches:
+        - 0.0.0 # Skip for 0.0.0 Tag
       max_concurrency: 10
       spec:
         containers: