diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1461a3..040f2af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improve CNPG templates.
 
+### Fixed
+
+- Fix crossplane azure container tags.
+
 ## [2.33.0] - 2026-03-02
 
 ### Changed
diff --git a/helm/grafana/templates/cnpg/crossplane/azure/container.yaml b/helm/grafana/templates/cnpg/crossplane/azure/container.yaml
index 93f77d9..7ef416e 100644
--- a/helm/grafana/templates/cnpg/crossplane/azure/container.yaml
+++ b/helm/grafana/templates/cnpg/crossplane/azure/container.yaml
@@ -1,6 +1,6 @@
 {{- if and (include "grafana.crossplane.enabled" .) (include "grafana.crossplane.isAzure" .) .Values.postgresqlCluster.crossplane.azure.enabled -}}
+{{- $tags := include "grafana.crossplane.tags" . | fromYaml -}}
 {{- $containerName := .Values.postgresqlCluster.crossplane.azure.container.name -}}
-{{- $storageAccountName := include "grafana.crossplane.azure.storageAccountName" (dict "containerName" $containerName) -}}
 ---
 apiVersion: storage.azure.upbound.io/v1beta1
 kind: Container
@@ -13,9 +13,12 @@ metadata:
 spec:
   forProvider:
     containerAccessType: {{ .Values.postgresqlCluster.crossplane.azure.containerAccessType | default "private" }}
+    {{- if $tags }}
     metadata:
-      app: grafana-postgresql
-      managed-by: crossplane
+      {{- range $key, $value := $tags }}
+      {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
     storageAccountNameSelector:
       matchLabels:
         {{- include "grafana.crossplane.labels" (dict "ctx" . "component" "storage") | nindent 8 }}