diff --git a/components/multi-platform-controller/production-downstream/base/kustomization.yaml b/components/multi-platform-controller/production-downstream/base/kustomization.yaml
index 769c5aacc0d..9aa3c892e44 100644
--- a/components/multi-platform-controller/production-downstream/base/kustomization.yaml
+++ b/components/multi-platform-controller/production-downstream/base/kustomization.yaml
@@ -5,8 +5,8 @@ namespace: multi-platform-controller
 
 resources:
 - ../../base/common
-- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=15303ceacd6bda9efbe336fd96058340588b6a86
-- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=15303ceacd6bda9efbe336fd96058340588b6a86
+- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
+- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 - external-secrets.yaml
 
 components:
@@ -15,7 +15,7 @@ components:
 images:
 - name: multi-platform-controller
   newName: quay.io/konflux-ci/multi-platform-controller
-  newTag: 15303ceacd6bda9efbe336fd96058340588b6a86
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 - name: multi-platform-otp-server
   newName: quay.io/konflux-ci/multi-platform-controller-otp-service
-  newTag: 15303ceacd6bda9efbe336fd96058340588b6a86
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
diff --git a/components/multi-platform-controller/production-downstream/stone-prod-p02/external-secrets.yaml b/components/multi-platform-controller/production-downstream/stone-prod-p02/external-secrets.yaml
deleted file mode 100644
index 30ca246f4d3..00000000000
--- a/components/multi-platform-controller/production-downstream/stone-prod-p02/external-secrets.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: aws-ssh-key
-  namespace: multi-platform-controller
-  labels:
-    build.appstudio.redhat.com/multi-platform-secret: "true"
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: "-1"
-spec:
-  dataFrom:
-    - extract:
-        key: production/build/multi-platform-controller/internal-prod-ssh-key
-  refreshInterval: 1h
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: appsre-stonesoup-vault
-  target:
-    creationPolicy: Owner
-    deletionPolicy: Delete
-    name: aws-ssh-key
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: aws-account
-  namespace: multi-platform-controller
-  labels:
-    build.appstudio.redhat.com/multi-platform-secret: "true"
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: "-1"
-spec:
-  dataFrom:
-    - extract:
-        key: production/build/multi-platform-controller/internal-prod-aws-account
-  refreshInterval: 1h
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: appsre-stonesoup-vault
-  target:
-    creationPolicy: Owner
-    deletionPolicy: Delete
-    name: aws-account
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: internal-prod-ibm-ssh-key
-  namespace: multi-platform-controller
-  labels:
-    build.appstudio.redhat.com/multi-platform-secret: "true"
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: "-1"
-spec:
-  dataFrom:
-    - extract:
-        key: production/build/multi-platform-controller/internal-prod-ibm-ssh-key
-  refreshInterval: 1h
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: appsre-stonesoup-vault
-  target:
-    creationPolicy: Owner
-    deletionPolicy: Delete
-    name: internal-prod-ibm-ssh-key
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: internal-prod-ibm-api-key
-  namespace: multi-platform-controller
-  labels:
-    build.appstudio.redhat.com/multi-platform-secret: "true"
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: "-1"
-spec:
-  dataFrom:
-    - extract:
-        key: production/build/multi-platform-controller/internal-prod-ibm-api-key
-  refreshInterval: 1h
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: appsre-stonesoup-vault
-  target:
-    creationPolicy: Owner
-    deletionPolicy: Delete
-    name: internal-prod-ibm-api-key
diff --git a/components/multi-platform-controller/production-downstream/stone-prod-p02/kustomization.yaml b/components/multi-platform-controller/production-downstream/stone-prod-p02/kustomization.yaml
index 3fb65f74007..2a221b795bd 100644
--- a/components/multi-platform-controller/production-downstream/stone-prod-p02/kustomization.yaml
+++ b/components/multi-platform-controller/production-downstream/stone-prod-p02/kustomization.yaml
@@ -4,19 +4,5 @@ kind: Kustomization
 namespace: multi-platform-controller
 
 resources:
-- ../../base/common
-- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
-- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
-- external-secrets.yaml
-- host-config.yaml
-
-components:
-  - ../../k-components/manager-resources
-
-images:
-- name: multi-platform-controller
-  newName: quay.io/konflux-ci/multi-platform-controller
-  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
-- name: multi-platform-otp-server
-  newName: quay.io/konflux-ci/multi-platform-controller-otp-service
-  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
+- ../base
+- host-config.yaml
\ No newline at end of file
diff --git a/components/multi-platform-controller/production/kflux-prd-rh02/kustomization.yaml b/components/multi-platform-controller/production/kflux-prd-rh02/kustomization.yaml
index ae91dd3426d..018ccabbd4d 100644
--- a/components/multi-platform-controller/production/kflux-prd-rh02/kustomization.yaml
+++ b/components/multi-platform-controller/production/kflux-prd-rh02/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 - ../../base/common
 - host-config.yaml
 - external-secrets.yaml
-- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=15303ceacd6bda9efbe336fd96058340588b6a86
-- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=15303ceacd6bda9efbe336fd96058340588b6a86
+- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
+- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 
 components:
   - ../../k-components/manager-resources
@@ -16,10 +16,10 @@ components:
 images:
 - name: multi-platform-controller
   newName: quay.io/konflux-ci/multi-platform-controller
-  newTag: 15303ceacd6bda9efbe336fd96058340588b6a86
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 - name: multi-platform-otp-server
   newName: quay.io/konflux-ci/multi-platform-controller-otp-service
-  newTag: 15303ceacd6bda9efbe336fd96058340588b6a86
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 
 patches:
   - path: manager_resources_patch.yaml
diff --git a/components/multi-platform-controller/production/kflux-prd-rh03/kustomization.yaml b/components/multi-platform-controller/production/kflux-prd-rh03/kustomization.yaml
index c6c6c3540b6..018ccabbd4d 100644
--- a/components/multi-platform-controller/production/kflux-prd-rh03/kustomization.yaml
+++ b/components/multi-platform-controller/production/kflux-prd-rh03/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 - ../../base/common
 - host-config.yaml
 - external-secrets.yaml
-- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=ec950d0cfb87bcfd6e3a79fc2b5ee40989126123
-- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=ec950d0cfb87bcfd6e3a79fc2b5ee40989126123
+- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
+- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 
 components:
   - ../../k-components/manager-resources
@@ -16,10 +16,10 @@ components:
 images:
 - name: multi-platform-controller
   newName: quay.io/konflux-ci/multi-platform-controller
-  newTag: ec950d0cfb87bcfd6e3a79fc2b5ee40989126123
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 - name: multi-platform-otp-server
   newName: quay.io/konflux-ci/multi-platform-controller-otp-service
-  newTag: ec950d0cfb87bcfd6e3a79fc2b5ee40989126123
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 
 patches:
   - path: manager_resources_patch.yaml
diff --git a/components/multi-platform-controller/production/stone-prd-rh01/kustomization.yaml b/components/multi-platform-controller/production/stone-prd-rh01/kustomization.yaml
index e55ee08f9a3..e248e50a6e6 100644
--- a/components/multi-platform-controller/production/stone-prd-rh01/kustomization.yaml
+++ b/components/multi-platform-controller/production/stone-prd-rh01/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 - ../../base/common
 - host-config.yaml
 - external-secrets.yaml
-- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=15303ceacd6bda9efbe336fd96058340588b6a86
-- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=15303ceacd6bda9efbe336fd96058340588b6a86
+- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
+- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 
 components:
   - ../../k-components/manager-resources
@@ -16,10 +16,10 @@ components:
 images:
 - name: multi-platform-controller
   newName: quay.io/konflux-ci/multi-platform-controller
-  newTag: 15303ceacd6bda9efbe336fd96058340588b6a86
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 - name: multi-platform-otp-server
   newName: quay.io/konflux-ci/multi-platform-controller-otp-service
-  newTag: 15303ceacd6bda9efbe336fd96058340588b6a86
+  newTag: 8cbcdd4a49ec9dba5d738b46b84d0c2a5d438f91
 
 
 patches: