diff --git a/src/helm/manifests/warren-api-secrets.yaml b/src/helm/manifests/warren-api-secrets.yaml
index 82213951a..b75ed3fbc 100644
--- a/src/helm/manifests/warren-api-secrets.yaml
+++ b/src/helm/manifests/warren-api-secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: warren-api-db-password
+  name: warren-api-db
 type: Opaque
 stringData:
   WARREN_API_DB_PASSWORD: pass
@@ -10,7 +10,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: warren-api-lrs-password
+  name: warren-api-lrs
 type: Opaque
 stringData:
   WARREN_LRS_AUTH_BASIC_PASSWORD: password
diff --git a/src/helm/manifests/warren-app-secrets.yaml b/src/helm/manifests/warren-app-secrets.yaml
index 437794dce..2a2bdee6a 100644
--- a/src/helm/manifests/warren-app-secrets.yaml
+++ b/src/helm/manifests/warren-app-secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: warren-app-db-password
+  name: warren-app-db
 type: Opaque
 stringData:
   WARREN_APP_DB_PASSWORD: pass
@@ -18,7 +18,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: warren-app-signing-key
+  name: warren-signing-key
 type: Opaque
 stringData:
   WARREN_APP_SIGNING_KEY: change_me
diff --git a/src/helm/warren/charts/api/templates/_helpers.tpl b/src/helm/warren/charts/api/templates/_helpers.tpl
index 826857f18..4b4a657b0 100644
--- a/src/helm/warren/charts/api/templates/_helpers.tpl
+++ b/src/helm/warren/charts/api/templates/_helpers.tpl
@@ -65,7 +65,7 @@ Environment variables
 - name: "WARREN_API_DB_PASSWORD"
   valueFrom:
     secretKeyRef:
-      name: warren-api-db-password
+      name: warren-api-db
       key: WARREN_API_DB_PASSWORD
 - name: "WARREN_API_DB_ENGINE"
   value: "{{ .Values.fastapi.db.engine }}"
@@ -82,14 +82,14 @@ Environment variables
 - name: "WARREN_LRS_AUTH_BASIC_PASSWORD"
   valueFrom:
     secretKeyRef:
-      name: warren-api-lrs-password
+      name: warren-api-lrs
       key: WARREN_LRS_AUTH_BASIC_PASSWORD
 - name: "WARREN_APP_SIGNING_ALGORITHM"
   value: "{{ .Values.fastapi.signingAlgorithm }}"
 - name: "WARREN_APP_SIGNING_KEY"
   valueFrom:
     secretKeyRef:
-      name: warren-app-signing-key
+      name: warren-signing-key
       key: WARREN_APP_SIGNING_KEY
 {{- range $key, $val := .Values.env.secret }}
 - name: {{ $val.envName }}
diff --git a/src/helm/warren/charts/app/templates/_helpers.tpl b/src/helm/warren/charts/app/templates/_helpers.tpl
index 7d3c33433..e73271dfa 100644
--- a/src/helm/warren/charts/app/templates/_helpers.tpl
+++ b/src/helm/warren/charts/app/templates/_helpers.tpl
@@ -74,7 +74,7 @@ Environment variables
 - name: "WARREN_APP_DB_PASSWORD"
   valueFrom:
     secretKeyRef:
-      name: warren-app-db-password
+      name: warren-app-db
       key: WARREN_APP_DB_PASSWORD
 - name: "WARREN_APP_DB_HOST"
   value: "{{ .Values.django.db.host }}"
@@ -85,7 +85,7 @@ Environment variables
 - name: "WARREN_APP_SIGNING_KEY"
   valueFrom:
     secretKeyRef:
-      name: warren-app-signing-key
+      name: warren-signing-key
       key: WARREN_APP_SIGNING_KEY 
 - name: "WARREN_APP_ACCESS_TOKEN_LIFETIME"
   value: "{{ .Values.django.accessTokenLifetime }}"