diff --git a/charts/controller/templates/_helpers.tpl b/charts/controller/templates/_helpers.tpl
index c4f0bb297..ef97d9513 100644
--- a/charts/controller/templates/_helpers.tpl
+++ b/charts/controller/templates/_helpers.tpl
@@ -58,18 +58,34 @@ env:
     secretKeyRef:
       name: builder-key-auth
       key: builder-key
+{{- if (.Values.databaseReplicaUrl) }}
+- name: DRYCC_DATABASE_REPLICA_URL
+  valueFrom:
+    secretKeyRef:
+      name: controller-creds
+      key: database-replica-url
+{{- end }}
 {{- if (.Values.databaseUrl) }}
 - name: DRYCC_DATABASE_URL
   valueFrom:
     secretKeyRef:
       name: controller-creds
       key: database-url
-{{- if (.Values.databaseReplicaUrl) }}
-- name: DRYCC_DATABASE_REPLICA_URL
+{{- else if eq .Values.global.databaseLocation "on-cluster"  }}
+- name: DRYCC_PG_USER
   valueFrom:
     secretKeyRef:
-      name: controller-creds
-      key: database-replica-url
+      name: database-creds
+      key: user
+- name: DRYCC_PG_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: database-creds
+      key: password
+- name: DRYCC_DATABASE_URL
+  value: "postgres://$(DRYCC_PG_USER):$(DRYCC_PG_PASSWORD)@drycc-database.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/controller"
+- name: DRYCC_DATABASE_REPLICA_URL
+  value: "postgres://$(DRYCC_PG_USER):$(DRYCC_PG_PASSWORD)@drycc-database-replica.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/controller"
 {{- end }}
 {{- if (.Values.databaseMonitorUrl) }}
 - name: DRYCC_DATABASE_MONITOR_URL
@@ -77,24 +93,19 @@ env:
     secretKeyRef:
       name: controller-creds
       key: database-monitor-url
-{{- end }}
-{{- else if eq .Values.global.databaseLocation "on-cluster"  }}
-- name: DRYCC_DATABASE_USER
+{{- else if eq .Values.global.timeseriesLocation "on-cluster"  }}
+- name: DRYCC_TS_USER
   valueFrom:
     secretKeyRef:
       name: database-creds
       key: user
-- name: DRYCC_DATABASE_PASSWORD
+- name: DRYCC_TS_PASSWORD
   valueFrom:
     secretKeyRef:
       name: database-creds
       key: password
-- name: DRYCC_DATABASE_URL
-  value: "postgres://$(DRYCC_DATABASE_USER):$(DRYCC_DATABASE_PASSWORD)@drycc-database.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/controller"
-- name: DRYCC_DATABASE_REPLICA_URL
-  value: "postgres://$(DRYCC_DATABASE_USER):$(DRYCC_DATABASE_PASSWORD)@drycc-database-replica.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/controller"
 - name: DRYCC_DATABASE_MONITOR_URL
-  value: "postgres://$(DRYCC_DATABASE_USER):$(DRYCC_DATABASE_PASSWORD)@drycc-database-replica.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/monitor"
+  value: "postgres://$(DRYCC_TS_USER):$(DRYCC_TS_PASSWORD)@drycc-timeseries-replica.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/monitor"
 {{- end }}
 {{- if (.Values.workflowManagerUrl) }}
 - name: WORKFLOW_MANAGER_URL