diff --git a/.konflux/main/component-operator.yaml b/.konflux/main/component-operator.yaml
index 86d8fa6df..be556512c 100644
--- a/.konflux/main/component-operator.yaml
+++ b/.konflux/main/component-operator.yaml
@@ -3,13 +3,13 @@ apiVersion: appstudio.redhat.com/v1alpha1
 kind: Component
 metadata:
   annotations:
-    image.redhat.com/generate: "true"
     build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
-    image.redhat.com/generate: '{"visibility": "public"}'
   name: operator-main-operator
 spec:
   componentName: operator
   application: operator-main
+  build-nudges-ref:
+  - operator-main-bundle
   source:
     git:
       url: https://github.com/openshift-pipelines/operator
diff --git a/.konflux/main/component-proxy.yaml b/.konflux/main/component-proxy.yaml
index 10c494f7a..7579ad82c 100644
--- a/.konflux/main/component-proxy.yaml
+++ b/.konflux/main/component-proxy.yaml
@@ -3,13 +3,13 @@ apiVersion: appstudio.redhat.com/v1alpha1
 kind: Component
 metadata:
   annotations:
-    image.redhat.com/generate: "true"
     build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
-    image.redhat.com/generate: '{"visibility": "public"}'
   name: operator-main-proxy
 spec:
   componentName: proxy
   application: operator-main
+  build-nudges-ref:
+  - operator-main-bundle
   source:
     git:
       url: https://github.com/openshift-pipelines/operator
diff --git a/.konflux/main/component-webhook.yaml b/.konflux/main/component-webhook.yaml
index d61c86484..34ddbffdc 100644
--- a/.konflux/main/component-webhook.yaml
+++ b/.konflux/main/component-webhook.yaml
@@ -3,13 +3,13 @@ apiVersion: appstudio.redhat.com/v1alpha1
 kind: Component
 metadata:
   annotations:
-    image.redhat.com/generate: "true"
     build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
-    image.redhat.com/generate: '{"visibility": "public"}'
   name: operator-main-webhook
 spec:
   componentName: webhook
   application: operator-main
+  build-nudges-ref:
+  - operator-main-bundle
   source:
     git:
       url: https://github.com/openshift-pipelines/operator
diff --git a/.konflux/main/image-operator.yaml b/.konflux/main/image-operator.yaml
new file mode 100644
index 000000000..c54c6252a
--- /dev/null
+++ b/.konflux/main/image-operator.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-main-operator
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-main-operator
+    appstudio.redhat.com/application: operator-main
+spec:
+  image:
+   name: operator-main/operator
+   visibility: public
diff --git a/.konflux/main/image-proxy.yaml b/.konflux/main/image-proxy.yaml
new file mode 100644
index 000000000..d1e0279c3
--- /dev/null
+++ b/.konflux/main/image-proxy.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-main-proxy
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-main-proxy
+    appstudio.redhat.com/application: operator-main
+spec:
+  image:
+   name: operator-main/proxy
+   visibility: public
diff --git a/.konflux/main/image-webhook.yaml b/.konflux/main/image-webhook.yaml
new file mode 100644
index 000000000..60566cb00
--- /dev/null
+++ b/.konflux/main/image-webhook.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-main-webhook
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-main-webhook
+    appstudio.redhat.com/application: operator-main
+spec:
+  image:
+   name: operator-main/webhook
+   visibility: public
diff --git a/.konflux/release-v1.17.x/component-operator.yaml b/.konflux/release-v1.17.x/component-operator.yaml
index 98daf1349..e343048de 100644
--- a/.konflux/release-v1.17.x/component-operator.yaml
+++ b/.konflux/release-v1.17.x/component-operator.yaml
@@ -3,13 +3,13 @@ apiVersion: appstudio.redhat.com/v1alpha1
 kind: Component
 metadata:
   annotations:
-    image.redhat.com/generate: "true"
     build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
-    image.redhat.com/generate: '{"visibility": "public"}'
   name: operator-1-17-operator
 spec:
   componentName: operator
   application: operator-release-v1-17-x
+  build-nudges-ref:
+  - operator-release-v1-17-x-bundle
   source:
     git:
       url: https://github.com/openshift-pipelines/operator
diff --git a/.konflux/release-v1.17.x/component-proxy.yaml b/.konflux/release-v1.17.x/component-proxy.yaml
index 148037cea..57dce377b 100644
--- a/.konflux/release-v1.17.x/component-proxy.yaml
+++ b/.konflux/release-v1.17.x/component-proxy.yaml
@@ -3,13 +3,13 @@ apiVersion: appstudio.redhat.com/v1alpha1
 kind: Component
 metadata:
   annotations:
-    image.redhat.com/generate: "true"
     build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
-    image.redhat.com/generate: '{"visibility": "public"}'
   name: operator-1-17-proxy
 spec:
   componentName: proxy
   application: operator-release-v1-17-x
+  build-nudges-ref:
+  - operator-release-v1-17-x-bundle
   source:
     git:
       url: https://github.com/openshift-pipelines/operator
diff --git a/.konflux/release-v1.17.x/component-webhook.yaml b/.konflux/release-v1.17.x/component-webhook.yaml
index 4bb206620..29498ffcc 100644
--- a/.konflux/release-v1.17.x/component-webhook.yaml
+++ b/.konflux/release-v1.17.x/component-webhook.yaml
@@ -3,13 +3,13 @@ apiVersion: appstudio.redhat.com/v1alpha1
 kind: Component
 metadata:
   annotations:
-    image.redhat.com/generate: "true"
     build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
-    image.redhat.com/generate: '{"visibility": "public"}'
   name: operator-1-17-webhook
 spec:
   componentName: webhook
   application: operator-release-v1-17-x
+  build-nudges-ref:
+  - operator-release-v1-17-x-bundle
   source:
     git:
       url: https://github.com/openshift-pipelines/operator
diff --git a/.konflux/release-v1.17.x/image-operator.yaml b/.konflux/release-v1.17.x/image-operator.yaml
new file mode 100644
index 000000000..afd86fdaa
--- /dev/null
+++ b/.konflux/release-v1.17.x/image-operator.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-1-17-operator
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-1-17-operator
+    appstudio.redhat.com/application: operator-release-v1-17-x
+spec:
+  image:
+   name: operator-release-v1-17-x/operator
+   visibility: public
diff --git a/.konflux/release-v1.17.x/image-proxy.yaml b/.konflux/release-v1.17.x/image-proxy.yaml
new file mode 100644
index 000000000..856488688
--- /dev/null
+++ b/.konflux/release-v1.17.x/image-proxy.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-1-17-proxy
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-1-17-proxy
+    appstudio.redhat.com/application: operator-release-v1-17-x
+spec:
+  image:
+   name: operator-release-v1-17-x/proxy
+   visibility: public
diff --git a/.konflux/release-v1.17.x/image-webhook.yaml b/.konflux/release-v1.17.x/image-webhook.yaml
new file mode 100644
index 000000000..aba0cb6a4
--- /dev/null
+++ b/.konflux/release-v1.17.x/image-webhook.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-1-17-webhook
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-1-17-webhook
+    appstudio.redhat.com/application: operator-release-v1-17-x
+spec:
+  image:
+   name: operator-release-v1-17-x/webhook
+   visibility: public