diff --git a/helm/cluster_setup/Chart.yaml b/helm/cluster_setup/Chart.yaml
index 51191a0..ec2f795 100644
--- a/helm/cluster_setup/Chart.yaml
+++ b/helm/cluster_setup/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cluster_setup
-version: 0.5.1
+version: 0.5.2
 type: application
 description: "Initial cluster setup"
 maintainers:
@@ -9,7 +9,7 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: fixed
-      description: Always use global namespace in helpers
+      description: Pass correct context to helpers
   artifacthub.io/signKey: |
     fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8
     url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc
diff --git a/helm/cluster_setup/templates/thanos-object-storage.yaml b/helm/cluster_setup/templates/thanos-object-storage.yaml
index e70b69e..e4a82a3 100644
--- a/helm/cluster_setup/templates/thanos-object-storage.yaml
+++ b/helm/cluster_setup/templates/thanos-object-storage.yaml
@@ -15,11 +15,11 @@ metadata:
   namespace: {{ .name | default "observability" }}
   name: thanos-object-storage-config
   labels:
-    {{- include "template.labels" . | nindent 4 }}
+    {{- include "template.labels" $ | nindent 4 }}
   annotations:
-    {{- include "template.annotations" . | nindent 4 }}
+    {{- include "template.annotations" $ | nindent 4 }}
 data:
   thanos.yaml: |-
-    {{ tpl ($.Files.Get "thanos.yaml") . | b64enc }}
+    {{ tpl ($.Files.Get "thanos.yaml") $ | b64enc }}
 {{- end }}
 {{- end }}
\ No newline at end of file