diff --git a/k8s/distributed-chroma/templates/compaction-service.yaml b/k8s/distributed-chroma/templates/compaction-service.yaml
index 57c829dcd5a..dbf8ba11b04 100644
--- a/k8s/distributed-chroma/templates/compaction-service.yaml
+++ b/k8s/distributed-chroma/templates/compaction-service.yaml
@@ -22,12 +22,15 @@ spec:
           ports:
             - containerPort: 50051
           env:
-            {{ range .Values.compactionService.env }}
+            {{ range .Values.sysdb.env }}
+            - name: {{ .name }}
+              # TODO properly use flow control here to check which type of value we need.
+{{ .value | nindent 14 }}
+            {{ end }}
             - name: CHROMA_COMPACTION_SERVICE__MY_IP
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
-            {{ end }}
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: "kubernetes.io/hostname"
diff --git a/k8s/distributed-chroma/templates/query-service.yaml b/k8s/distributed-chroma/templates/query-service.yaml
index c4dc3ac7f73..eb0518f4eb4 100644
--- a/k8s/distributed-chroma/templates/query-service.yaml
+++ b/k8s/distributed-chroma/templates/query-service.yaml
@@ -43,12 +43,15 @@ spec:
             - name: chroma
               mountPath: /index_data
           env:
-            {{ range .Values.queryService.env }}
+            {{ range .Values.sysdb.env }}
+            - name: {{ .name }}
+              # TODO properly use flow control here to check which type of value we need.
+{{ .value | nindent 14 }}
+            {{ end }}
             - name: CHROMA_QUERY_SERVICE__MY_IP
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
-            {{ end }}
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: "kubernetes.io/hostname"