diff --git a/services/comms/helmrelease.yaml b/services/comms/helmrelease.yaml
index 755adc4..45185cc 100644
--- a/services/comms/helmrelease.yaml
+++ b/services/comms/helmrelease.yaml
@@ -84,7 +84,7 @@ spec:
           export POSTGRES_PASSWORD="{{ .Data.data.POSTGRES_PASSWORD }}"
           {{ end }}
           {{ with secret "kv/data/atlas/comms/synapse-redis" }}
-          export REDIS_PASSWORD="{{ .Data.data.redis-password }}"
+          export REDIS_PASSWORD="{{ index .Data.data "redis-password" }}"
           {{ end }}
           {{ with secret "kv/data/atlas/comms/turn-shared-secret" }}
           export TURN_SECRET="{{ .Data.data.TURN_STATIC_AUTH_SECRET }}"
@@ -278,7 +278,7 @@ spec:
                       vault.hashicorp.com/agent-inject-secret-redis-env.sh: "kv/data/atlas/comms/synapse-redis"
                       vault.hashicorp.com/agent-inject-template-redis-env.sh: |
                         {{ with secret "kv/data/atlas/comms/synapse-redis" }}
-                        export REDIS_PASSWORD="{{ .Data.data.redis-password }}"
+                        export REDIS_PASSWORD="{{ index .Data.data "redis-password" }}"
                         {{ end }}
                   spec:
                     serviceAccountName: comms-vault
diff --git a/services/monitoring/helmrelease.yaml b/services/monitoring/helmrelease.yaml
index 470784c..d535ebe 100644
--- a/services/monitoring/helmrelease.yaml
+++ b/services/monitoring/helmrelease.yaml
@@ -269,12 +269,12 @@ spec:
       vault.hashicorp.com/agent-inject-secret-grafana-env.sh: "kv/data/atlas/monitoring/grafana-admin"
       vault.hashicorp.com/agent-inject-template-grafana-env.sh: |
         {{ with secret "kv/data/atlas/monitoring/grafana-admin" }}
-        export GF_SECURITY_ADMIN_USER="{{ .Data.data.admin-user }}"
-        export GF_SECURITY_ADMIN_PASSWORD="{{ .Data.data.admin-password }}"
+        export GF_SECURITY_ADMIN_USER="{{ index .Data.data "admin-user" }}"
+        export GF_SECURITY_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
         {{ end }}
         {{ with secret "kv/data/atlas/shared/postmark-relay" }}
-        export GF_SMTP_USER="{{ .Data.data.relay-username }}"
-        export GF_SMTP_PASSWORD="{{ .Data.data.relay-password }}"
+        export GF_SMTP_USER="{{ index .Data.data "relay-username" }}"
+        export GF_SMTP_PASSWORD="{{ index .Data.data "relay-password" }}"
         {{ end }}
     persistence:
       enabled: true