diff --git a/charts/acm-operator/Chart.yaml b/charts/acm-operator/Chart.yaml
index 257f3b4..7ab842a 100644
--- a/charts/acm-operator/Chart.yaml
+++ b/charts/acm-operator/Chart.yaml
@@ -10,6 +10,6 @@ dependencies:
     version: 1.1.0
     repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
 name: acm-operator
-version: 0.5.24
+version: 0.5.25
 apiVersion: v2
 description: Chart to deploy Red Hat Advanced Cluster Management (RHACM) with ArgoCD ApplicationSets for spoke cluster management
diff --git a/charts/acm-operator/templates/namespace.yaml b/charts/acm-operator/templates/namespace.yaml
index 8e9660a..0745758 100644
--- a/charts/acm-operator/templates/namespace.yaml
+++ b/charts/acm-operator/templates/namespace.yaml
@@ -6,13 +6,12 @@ metadata:
   name: "{{ $ns.name }}"
   annotations:
     argocd.argoproj.io/sync-wave: "-10"
-  {{- if $ns.annotations }}
-  annotations:
-    {{- toYaml $ns.annotations | trimPrefix "|" | indent 2 }}
-  {{ end }}
-  labels:
+    {{- with $ns.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- if $ns.labels }}
-    {{- toYaml $ns.labels | trimPrefix "|" | indent 2 }}
-  {{ end }}
+  labels:
+    {{- toYaml $ns.labels | nindent 4 }}
+  {{- end }}
 ---
 {{ end -}}