diff --git a/services/nextcloud-mail-sync/cronjob.yaml b/services/nextcloud-mail-sync/cronjob.yaml
index 75fe548..5042f4b 100644
--- a/services/nextcloud-mail-sync/cronjob.yaml
+++ b/services/nextcloud-mail-sync/cronjob.yaml
@@ -20,18 +20,18 @@ spec:
             vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: |
               {{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}}
               export POSTGRES_DB="{{ .Data.data.database }}"
-              export POSTGRES_USER="{{ .Data.data.db-username }}"
-              export POSTGRES_PASSWORD="{{ .Data.data.db-password }}"
+              export POSTGRES_USER="{{ index .Data.data "db-username" }}"
+              export POSTGRES_PASSWORD="{{ index .Data.data "db-password" }}"
               {{- end }}
               {{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}}
-              export NEXTCLOUD_ADMIN_USER="{{ .Data.data.admin-user }}"
-              export NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.admin-password }}"
+              export NEXTCLOUD_ADMIN_USER="{{ index .Data.data "admin-user" }}"
+              export NEXTCLOUD_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
               {{- end }}
               export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}"
               export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}"
               {{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}}
-              export OIDC_CLIENT_ID="{{ .Data.data.client-id }}"
-              export OIDC_CLIENT_SECRET="{{ .Data.data.client-secret }}"
+              export OIDC_CLIENT_ID="{{ index .Data.data "client-id" }}"
+              export OIDC_CLIENT_SECRET="{{ index .Data.data "client-secret" }}"
               {{- end }}
               {{- with secret "kv/data/atlas/shared/postmark-relay" -}}
               export SMTP_NAME="{{ index .Data.data "relay-username" }}"
diff --git a/services/nextcloud/deployment.yaml b/services/nextcloud/deployment.yaml
index 84efb1d..063c6f7 100644
--- a/services/nextcloud/deployment.yaml
+++ b/services/nextcloud/deployment.yaml
@@ -17,23 +17,24 @@ spec:
         app: nextcloud
       annotations:
         vault.hashicorp.com/agent-inject: "true"
+        vault.hashicorp.com/agent-init-first: "true"
         vault.hashicorp.com/role: "nextcloud"
         vault.hashicorp.com/agent-inject-secret-nextcloud-env.sh: "kv/data/atlas/nextcloud/nextcloud-db"
         vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: |
           {{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}}
           export POSTGRES_DB="{{ .Data.data.database }}"
-          export POSTGRES_USER="{{ .Data.data.db-username }}"
-          export POSTGRES_PASSWORD="{{ .Data.data.db-password }}"
+          export POSTGRES_USER="{{ index .Data.data "db-username" }}"
+          export POSTGRES_PASSWORD="{{ index .Data.data "db-password" }}"
           {{- end }}
           {{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}}
-          export NEXTCLOUD_ADMIN_USER="{{ .Data.data.admin-user }}"
-          export NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.admin-password }}"
+          export NEXTCLOUD_ADMIN_USER="{{ index .Data.data "admin-user" }}"
+          export NEXTCLOUD_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
           {{- end }}
           export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}"
           export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}"
           {{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}}
-          export OIDC_CLIENT_ID="{{ .Data.data.client-id }}"
-          export OIDC_CLIENT_SECRET="{{ .Data.data.client-secret }}"
+          export OIDC_CLIENT_ID="{{ index .Data.data "client-id" }}"
+          export OIDC_CLIENT_SECRET="{{ index .Data.data "client-secret" }}"
           {{- end }}
           {{- with secret "kv/data/atlas/shared/postmark-relay" -}}
           export SMTP_NAME="{{ index .Data.data "relay-username" }}"
diff --git a/services/nextcloud/maintenance-cronjob.yaml b/services/nextcloud/maintenance-cronjob.yaml
index aaedbc8..f8af256 100644
--- a/services/nextcloud/maintenance-cronjob.yaml
+++ b/services/nextcloud/maintenance-cronjob.yaml
@@ -18,18 +18,18 @@ spec:
             vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: |
               {{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}}
               export POSTGRES_DB="{{ .Data.data.database }}"
-              export POSTGRES_USER="{{ .Data.data.db-username }}"
-              export POSTGRES_PASSWORD="{{ .Data.data.db-password }}"
+              export POSTGRES_USER="{{ index .Data.data "db-username" }}"
+              export POSTGRES_PASSWORD="{{ index .Data.data "db-password" }}"
               {{- end }}
               {{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}}
-              export NEXTCLOUD_ADMIN_USER="{{ .Data.data.admin-user }}"
-              export NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.admin-password }}"
+              export NEXTCLOUD_ADMIN_USER="{{ index .Data.data "admin-user" }}"
+              export NEXTCLOUD_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
               {{- end }}
               export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}"
               export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}"
               {{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}}
-              export OIDC_CLIENT_ID="{{ .Data.data.client-id }}"
-              export OIDC_CLIENT_SECRET="{{ .Data.data.client-secret }}"
+              export OIDC_CLIENT_ID="{{ index .Data.data "client-id" }}"
+              export OIDC_CLIENT_SECRET="{{ index .Data.data "client-secret" }}"
               {{- end }}
               {{- with secret "kv/data/atlas/shared/postmark-relay" -}}
               export SMTP_NAME="{{ index .Data.data "relay-username" }}"