diff --git a/helm/cluster_setup/Chart.yaml b/helm/cluster_setup/Chart.yaml
index 42569d7..955bb1e 100644
--- a/helm/cluster_setup/Chart.yaml
+++ b/helm/cluster_setup/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cluster_setup
-version: 0.3.1
+version: 0.3.2
 type: application
 description: "Initial cluster setup"
 maintainers:
@@ -8,8 +8,8 @@ maintainers:
     url: https://2martens.de
 annotations:
   artifacthub.io/changes: |
-    - kind: fixed
-      description: Disable thanos by default
+    - kind: changed
+      description: Create namespace if thanos is enabled
   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 ebfe8cd..7b3677e 100644
--- a/helm/cluster_setup/templates/thanos-object-storage.yaml
+++ b/helm/cluster_setup/templates/thanos-object-storage.yaml
@@ -1,5 +1,10 @@
 {{- if .Values.thanos.enabled }}
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.thanos.namespace | default "observability" }}
+---
+apiVersion: v1
 kind: Secret
 metadata:
   namespace: {{ .Values.thanos.namespace | default "observability" }}