diff --git a/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml b/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml
index eb2203ccfc6d..536e9da02a95 100644
--- a/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml
+++ b/prow/jobs/kyma-project/application-connector-manager/application-connector-manager.yaml
@@ -56,13 +56,13 @@ presubmits: # runs on PRs
   
 postsubmits: # runs on main
   kyma-project/application-connector-manager:
-    - name: post-application-connector-manager-build
+    - name: main-application-connector-manager-build
       annotations:
         description: "Job to build application-connector operator for a release"
         owner: "framefrog"
       labels:
         prow.k8s.io/pubsub.project: "sap-kyma-prow"
-        prow.k8s.io/pubsub.runID: "post-application-connector-manager-build"
+        prow.k8s.io/pubsub.runID: "main-application-connector-manager-build"
         prow.k8s.io/pubsub.topic: "prowjobs"
         preset-sa-kyma-push-images: "true"
         preset-signify-prod-secret: "true"
@@ -72,7 +72,6 @@ postsubmits: # runs on main
       cluster: trusted-workload
       max_concurrency: 10
       branches:
-        - ^master$
         - ^main$
       spec:
         containers:
@@ -108,6 +107,57 @@ postsubmits: # runs on main
           - name: signify-secret
             secret:
               secretName: signify-dev-secret
+    - name: release-application-connector-manager-build
+      annotations:
+        description: "Job to build application-connector operator for a release"
+        owner: "framefrog"
+      labels:
+        prow.k8s.io/pubsub.project: "sap-kyma-prow"
+        prow.k8s.io/pubsub.runID: "release-application-connector-manager-build"
+        prow.k8s.io/pubsub.topic: "prowjobs"
+        preset-sa-kyma-push-images: "true"
+        preset-signify-prod-secret: "true"
+      always_run: true
+      skip_report: false
+      decorate: true
+      cluster: trusted-workload
+      max_concurrency: 10
+      branches:
+        - ^\d+\.\d+\.\d+(?:-.*)?$
+      spec:
+        containers:
+          - image: "europe-docker.pkg.dev/kyma-project/prod/image-builder:v20240521-098832b4"
+            securityContext:
+              privileged: false
+              seccompProfile:
+                type: RuntimeDefault
+              allowPrivilegeEscalation: false
+            command:
+              - "/image-builder"
+            args:
+              - "--name=application-connector-manager"
+              - "--config=/config/kaniko-build-config.yaml"
+              - "--context=."
+              - "--dockerfile=Dockerfile"
+              - "--tag=$(PULL_BASE_REF)"
+            resources:
+              requests:
+                memory: 1.5Gi
+                cpu: 1
+            volumeMounts:
+              - name: config
+                mountPath: /config
+                readOnly: true
+              - name: signify-secret
+                mountPath: /secret
+                readOnly: true
+        volumes:
+          - name: config
+            configMap:
+              name: kaniko-build-config
+          - name: signify-secret
+            secret:
+              secretName: signify-dev-secret
     - name: post-main-application-connector-manager-upgrade-latest-to-main
       annotations:
         description: "upgrade application-connector manager test"
@@ -126,7 +176,6 @@ postsubmits: # runs on main
       cluster: trusted-workload
       max_concurrency: 10
       branches:
-        - ^master$
         - ^main$
       extra_refs:
         - org: kyma-project