diff --git a/argocd/image-updater-manifests/image-updater-secret.yaml b/argocd/image-updater-manifests/image-updater-secret.yaml
index cc5dd89..879ccfd 100644
--- a/argocd/image-updater-manifests/image-updater-secret.yaml
+++ b/argocd/image-updater-manifests/image-updater-secret.yaml
@@ -19,11 +19,11 @@ spec:
   data:
     - secretKey: USERNAME
       remoteRef:
-        key: zot
+        key: storage/zot
         property: USERNAME
     - secretKey: PASSWORD
       remoteRef:
-        key: zot
+        key: storage/zot
         property: PASSWORD
 ---
 apiVersion: external-secrets.io/v1
@@ -42,11 +42,11 @@ spec:
   data:
     - secretKey: username
       remoteRef:
-        key: github
+        key: platform/github
         property: username
     - secretKey: password
       remoteRef:
-        key: github
+        key: platform/github
         property: password
 ---
 apiVersion: external-secrets.io/v1
@@ -74,9 +74,9 @@ spec:
   data:
     - secretKey: username
       remoteRef:
-        key: gitea
+        key: platform/gitea
         property: username
     - secretKey: password
       remoteRef:
-        key: gitea
+        key: platform/gitea
         property: password
diff --git a/gitea-runner/manifests/runner-secret.yaml b/gitea-runner/manifests/runner-secret.yaml
index 753c9e8..91f1c47 100644
--- a/gitea-runner/manifests/runner-secret.yaml
+++ b/gitea-runner/manifests/runner-secret.yaml
@@ -14,5 +14,5 @@ spec:
   data:
     - secretKey: token
       remoteRef:
-        key: gitea
+        key: platform/gitea
         property: runner_token
diff --git a/gitea-runner/manifests/zot-secret.yaml b/gitea-runner/manifests/zot-secret.yaml
index ead019a..4c96768 100644
--- a/gitea-runner/manifests/zot-secret.yaml
+++ b/gitea-runner/manifests/zot-secret.yaml
@@ -19,9 +19,9 @@ spec:
   data:
     - secretKey: USERNAME
       remoteRef:
-        key: zot
+        key: storage/zot
         property: USERNAME
     - secretKey: PASSWORD
       remoteRef:
-        key: zot
+        key: storage/zot
         property: PASSWORD
diff --git a/tekton/ci-cd/manifests/secrets/zot-registry-secret.yaml b/tekton/ci-cd/manifests/secrets/zot-registry-secret.yaml
index 4553fd2..433d9f4 100644
--- a/tekton/ci-cd/manifests/secrets/zot-registry-secret.yaml
+++ b/tekton/ci-cd/manifests/secrets/zot-registry-secret.yaml
@@ -19,9 +19,9 @@ spec:
   data:
     - secretKey: USERNAME
       remoteRef:
-        key: zot
+        key: storage/zot
         property: USERNAME
     - secretKey: PASSWORD
       remoteRef:
-        key: zot
+        key: storage/zot
         property: PASSWORD
diff --git a/tekton/ci-cd/manifests/triggers/secret.yaml b/tekton/ci-cd/manifests/triggers/secret.yaml
index 58a3c8d..09ac8ff 100644
--- a/tekton/ci-cd/manifests/triggers/secret.yaml
+++ b/tekton/ci-cd/manifests/triggers/secret.yaml
@@ -14,5 +14,5 @@ spec:
   data:
     - secretKey: webhook-secret
       remoteRef:
-        key: tekton
+        key: platform/tekton
         property: GITEA_WEBHOOK_SECRET