diff --git a/9c-internal/9c-claim-items-test/values.yaml b/9c-internal/9c-claim-items-test/values.yaml
index 3ee207136..9c5b8eaae 100644
--- a/9c-internal/9c-claim-items-test/values.yaml
+++ b/9c-internal/9c-claim-items-test/values.yaml
@@ -23,7 +23,9 @@ global:
 
   resetSnapshot: true
   rollbackSnapshot: false
-  useExternalSecret: true
+
+externalSecret:
+  enabled: true
 
 snapshot:
   downloadSnapshot: true
diff --git a/9c-internal/9c-network/values.yaml b/9c-internal/9c-network/values.yaml
index 30853da39..aa46afcd7 100644
--- a/9c-internal/9c-network/values.yaml
+++ b/9c-internal/9c-network/values.yaml
@@ -23,7 +23,9 @@ global:
 
   resetSnapshot: true
   rollbackSnapshot: false
-  useExternalSecret: true
+
+externalSecret:
+  enabled: true
 
 snapshot:
   downloadSnapshot: true
diff --git a/9c-internal/9c-single/values.yaml b/9c-internal/9c-single/values.yaml
index cc0fcd65f..52cc4da37 100644
--- a/9c-internal/9c-single/values.yaml
+++ b/9c-internal/9c-single/values.yaml
@@ -24,10 +24,13 @@ global:
   consensusType: pbft
   
   resetSnapshot: false
-  useExternalSecret: true
   slackToken: ""
   slackWebHookUrl: ""
 
+externalSecret:
+  enabled: true
+  prefix: "9c-single"
+
 snapshot:
   downloadSnapshot: false
   fullSnapshot:
diff --git a/9c-main/9c-network/values.yaml b/9c-main/9c-network/values.yaml
index c1781ff63..db775fd6a 100644
--- a/9c-main/9c-network/values.yaml
+++ b/9c-main/9c-network/values.yaml
@@ -30,7 +30,9 @@ global:
 
   resetSnapshot: false
   rollbackSnapshot: false
-  useExternalSecret: true
+
+externalSecret:
+  enabled: true
 
 snapshot:
   slackChannel: "9c-mainnet"
diff --git a/charts/all-in-one/templates/secret-aws-keys.yaml b/charts/all-in-one/templates/secret-aws-keys.yaml
index 1ac36efe3..f6296c8bc 100644
--- a/charts/all-in-one/templates/secret-aws-keys.yaml
+++ b/charts/all-in-one/templates/secret-aws-keys.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -16,7 +16,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/aws-keys
+      {{- else }}
       key: {{ .Values.clusterName }}/aws-keys
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-bridge.yaml b/charts/all-in-one/templates/secret-bridge.yaml
index 5999615e0..eb8ceaabf 100644
--- a/charts/all-in-one/templates/secret-bridge.yaml
+++ b/charts/all-in-one/templates/secret-bridge.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.bridge.enabled }}
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -17,7 +17,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecrets.prefix }}/bridge
+      {{- else }}
       key: {{ .Values.clusterName }}/bridge
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-data-provider.yaml b/charts/all-in-one/templates/secret-data-provider.yaml
index 4de4b9259..5ccd4d9d7 100644
--- a/charts/all-in-one/templates/secret-data-provider.yaml
+++ b/charts/all-in-one/templates/secret-data-provider.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.dataProvider.enabled }}
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -17,7 +17,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/data-provider
+      {{- else }}
       key: {{ .Values.clusterName }}/data-provider
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-market-db.yaml b/charts/all-in-one/templates/secret-market-db.yaml
index 25d3b3244..4f406ec6c 100644
--- a/charts/all-in-one/templates/secret-market-db.yaml
+++ b/charts/all-in-one/templates/secret-market-db.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.marketService.enabled }}
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -17,7 +17,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/market-db
+      {{- else }}
       key: {{ .Values.clusterName }}/market-db
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-patrol-reward.yaml b/charts/all-in-one/templates/secret-patrol-reward.yaml
index 158c8e562..ce21cb523 100644
--- a/charts/all-in-one/templates/secret-patrol-reward.yaml
+++ b/charts/all-in-one/templates/secret-patrol-reward.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.patrolRewardService.enabled }}
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecrets.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -17,7 +17,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/patrol-reward
+      {{- else }}
       key: {{ .Values.clusterName }}/patrol-reward
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-private-keys.yaml b/charts/all-in-one/templates/secret-private-keys.yaml
index c3562463e..211d3b152 100644
--- a/charts/all-in-one/templates/secret-private-keys.yaml
+++ b/charts/all-in-one/templates/secret-private-keys.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -16,7 +16,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/private-keys
+      {{- else }}
       key: {{ .Values.clusterName }}/private-keys
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-slack-token.yaml b/charts/all-in-one/templates/secret-slack-token.yaml
index 86139b931..3497754ad 100644
--- a/charts/all-in-one/templates/secret-slack-token.yaml
+++ b/charts/all-in-one/templates/secret-slack-token.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -16,7 +16,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/slack
+      {{- else }}
       key: {{ .Values.clusterName }}/slack
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/templates/secret-store.yaml b/charts/all-in-one/templates/secret-store.yaml
index 9fd4a89b0..873041302 100644
--- a/charts/all-in-one/templates/secret-store.yaml
+++ b/charts/all-in-one/templates/secret-store.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: SecretStore
 metadata:
diff --git a/charts/all-in-one/templates/secret-world-boss.yaml b/charts/all-in-one/templates/secret-world-boss.yaml
index 847ff52fe..7d1737366 100644
--- a/charts/all-in-one/templates/secret-world-boss.yaml
+++ b/charts/all-in-one/templates/secret-world-boss.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.worldBoss.enabled }}
-{{ if .Values.global.useExternalSecret }}
+{{ if .Values.externalSecret.enabled }}
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
@@ -17,7 +17,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
+      {{- if .Values.externalSecret.prefix }}
+      key: {{ .Values.externalSecret.prefix }}/world-boss-env
+      {{- else }}
       key: {{ .Values.clusterName }}/world-boss-env
+      {{- end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/all-in-one/values.yaml b/charts/all-in-one/values.yaml
index 68166e3e6..b3460a0d4 100644
--- a/charts/all-in-one/values.yaml
+++ b/charts/all-in-one/values.yaml
@@ -29,6 +29,10 @@ global:
   slackToken: ""
   slackWebHookUrl: ""
 
+externalSecret:
+  enabled: false
+  prefix: ""
+
 snapshot:
   downloadSnapshot: false
   fullSnapshot: