diff --git a/charts/cryostat/templates/cryostat_deployment.yaml b/charts/cryostat/templates/cryostat_deployment.yaml
index 10cc8fa..68d0fb3 100644
--- a/charts/cryostat/templates/cryostat_deployment.yaml
+++ b/charts/cryostat/templates/cryostat_deployment.yaml
@@ -18,10 +18,10 @@ spec:
   template:
     metadata:
       annotations:
-      {{- with .Values.core.podAnnotations }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.core.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
diff --git a/charts/cryostat/templates/db_deployment.yaml b/charts/cryostat/templates/db_deployment.yaml
index bf899af..ec977b2 100644
--- a/charts/cryostat/templates/db_deployment.yaml
+++ b/charts/cryostat/templates/db_deployment.yaml
@@ -18,10 +18,10 @@ spec:
   template:
     metadata:
       annotations:
-      {{- with .Values.db.podAnnotations }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.db.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
diff --git a/charts/cryostat/templates/reports_deployment.yaml b/charts/cryostat/templates/reports_deployment.yaml
index 6f5f218..1fa2e5d 100644
--- a/charts/cryostat/templates/reports_deployment.yaml
+++ b/charts/cryostat/templates/reports_deployment.yaml
@@ -19,10 +19,10 @@ spec:
   template:
     metadata:
       annotations:
-      {{- with .Values.reports.podAnnotations }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.reports.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
diff --git a/charts/cryostat/templates/storage_deployment.yaml b/charts/cryostat/templates/storage_deployment.yaml
index 5aee4e6..4ad40d6 100644
--- a/charts/cryostat/templates/storage_deployment.yaml
+++ b/charts/cryostat/templates/storage_deployment.yaml
@@ -18,10 +18,10 @@ spec:
   template:
     metadata:
       annotations:
-      {{- with .Values.storage.podAnnotations }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.storage.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels: