diff --git a/.tekton/build-request-processor-push.yaml b/.tekton/build-request-processor-push.yaml
index 3bce77cb8..8f4540fbd 100644
--- a/.tekton/build-request-processor-push.yaml
+++ b/.tekton/build-request-processor-push.yaml
@@ -13,7 +13,6 @@ metadata:
     appstudio.openshift.io/application: jvm-build-service
     appstudio.openshift.io/component: build-request-processor
     pipelines.appstudio.openshift.io/type: build
-    konflux.additional-tags: "latest"
   name: build-request-processor-on-push
   namespace: konflux-jbs-pnc-tenant
 spec:
@@ -392,6 +391,8 @@ spec:
       params:
       - name: IMAGE
         value: $(tasks.build-container.results.IMAGE_URL)
+      - name: ADDITIONAL_TAGS
+        value: ["latest"]
       runAfter:
       - build-container
       taskRef:
diff --git a/.tekton/cache-push.yaml b/.tekton/cache-push.yaml
index 58cf3d08c..3943e88c7 100644
--- a/.tekton/cache-push.yaml
+++ b/.tekton/cache-push.yaml
@@ -13,7 +13,6 @@ metadata:
     appstudio.openshift.io/application: jvm-build-service
     appstudio.openshift.io/component: cache
     pipelines.appstudio.openshift.io/type: build
-    konflux.additional-tags: "latest"
   name: cache-on-push
   namespace: konflux-jbs-pnc-tenant
 spec:
@@ -392,6 +391,8 @@ spec:
       params:
       - name: IMAGE
         value: $(tasks.build-container.results.IMAGE_URL)
+      - name: ADDITIONAL_TAGS
+        value: ["latest"]
       runAfter:
       - build-container
       taskRef:
diff --git a/.tekton/cli-push.yaml b/.tekton/cli-push.yaml
index ca559b183..cc27c1490 100644
--- a/.tekton/cli-push.yaml
+++ b/.tekton/cli-push.yaml
@@ -13,7 +13,6 @@ metadata:
     appstudio.openshift.io/application: jvm-build-service
     appstudio.openshift.io/component: cli
     pipelines.appstudio.openshift.io/type: build
-    konflux.additional-tags: "latest"
   name: cli-on-push
   namespace: konflux-jbs-pnc-tenant
 spec:
@@ -392,6 +391,8 @@ spec:
       params:
       - name: IMAGE
         value: $(tasks.build-container.results.IMAGE_URL)
+      - name: ADDITIONAL_TAGS
+        value: ["latest"]
       runAfter:
       - build-container
       taskRef:
diff --git a/.tekton/controller-push.yaml b/.tekton/controller-push.yaml
index d44268870..595fe8680 100644
--- a/.tekton/controller-push.yaml
+++ b/.tekton/controller-push.yaml
@@ -13,7 +13,6 @@ metadata:
     appstudio.openshift.io/application: jvm-build-service
     appstudio.openshift.io/component: controller
     pipelines.appstudio.openshift.io/type: build
-    konflux.additional-tags: "latest"
   name: controller-on-push
   namespace: konflux-jbs-pnc-tenant
 spec:
@@ -390,6 +389,8 @@ spec:
       params:
       - name: IMAGE
         value: $(tasks.build-container.results.IMAGE_URL)
+      - name: ADDITIONAL_TAGS
+        value: ["latest"]
       runAfter:
       - build-container
       taskRef:
diff --git a/.tekton/domain-proxy-push.yaml b/.tekton/domain-proxy-push.yaml
index 554ebce04..4ff08ab61 100644
--- a/.tekton/domain-proxy-push.yaml
+++ b/.tekton/domain-proxy-push.yaml
@@ -13,7 +13,6 @@ metadata:
     appstudio.openshift.io/application: jvm-build-service
     appstudio.openshift.io/component: domain-proxy
     pipelines.appstudio.openshift.io/type: build
-    konflux.additional-tags: "latest"
   name: domain-proxy-on-push
   namespace: konflux-jbs-pnc-tenant
 spec:
@@ -421,6 +420,8 @@ spec:
       params:
       - name: IMAGE
         value: $(tasks.build-image-index.results.IMAGE_URL)
+      - name: ADDITIONAL_TAGS
+        value: ["latest"]
       runAfter:
       - build-image-index
       taskRef: