diff --git a/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml b/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml
index 404ca8a..30c1e33 100644
--- a/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml
+++ b/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml
@@ -32,7 +32,10 @@ spec:
       registry: quay.io
       repository: thanos/thanos
       tag: v0.33.0
-    existingObjstoreSecret: thanos-s3-secret
+    objstoreConfig:
+      type: s3
+      config:
+        insecure: true
     queryFrontend:
       enabled: true
       replicaCount: 3
@@ -92,3 +95,24 @@ spec:
       enabled: true
       serviceMonitor:
         enabled: true
+  valuesFrom:
+    - targetPath: objstoreConfig.config.bucket
+      kind: ConfigMap
+      name: thanos-bucket-v1
+      valuesKey: BUCKET_NAME
+    - targetPath: objstoreConfig.config.endpoint
+      kind: ConfigMap
+      name: thanos-bucket-v1
+      valuesKey: BUCKET_HOST
+    - targetPath: objstoreConfig.config.region
+      kind: ConfigMap
+      name: thanos-bucket-v1
+      valuesKey: BUCKET_REGION
+    - targetPath: objstoreConfig.config.access_key
+      kind: Secret
+      name: thanos-bucket-v1
+      valuesKey: AWS_ACCESS_KEY_ID
+    - targetPath: objstoreConfig.config.secret_key
+      kind: Secret
+      name: thanos-bucket-v1
+      valuesKey: AWS_SECRET_ACCESS_KEY
diff --git a/kubernetes/apps/monitoring/thanos/app/kustomization.yaml b/kubernetes/apps/monitoring/thanos/app/kustomization.yaml
index e4bccc4..c2c5807 100644
--- a/kubernetes/apps/monitoring/thanos/app/kustomization.yaml
+++ b/kubernetes/apps/monitoring/thanos/app/kustomization.yaml
@@ -6,6 +6,7 @@ namespace: monitoring
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
+  - ./objectbucketclaim.yaml
 configMapGenerator:
   - name: thanos-bucket-replicate-dashboard
     files:
diff --git a/kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml b/kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml
new file mode 100644
index 0000000..b0a75ce
--- /dev/null
+++ b/kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml
@@ -0,0 +1,10 @@
+# yaml-language-server: $schema=https://ks.hsn.dev/objectbucket.io/objectbucketclaim_v1alpha1.json
+---
+apiVersion: objectbucket.io/v1alpha1
+kind: ObjectBucketClaim
+metadata:
+  name: thanos-bucket-v1
+  namespace: monitoring
+spec:
+  bucketName: thanos-v1
+  storageClassName: ceph-bucket