diff --git a/manifests/composite/monitoring-stack/replacements/kustomization.yaml b/manifests/composite/monitoring-stack/replacements/kustomization.yaml
index 356645c0b..455d6a728 100644
--- a/manifests/composite/monitoring-stack/replacements/kustomization.yaml
+++ b/manifests/composite/monitoring-stack/replacements/kustomization.yaml
@@ -1,2 +1,3 @@
 resources:
   - ../../../function/grafana/replacements
+  - ../../../function/thanos-operator/replacements
diff --git a/manifests/function/thanos-operator/helmrelease.yaml b/manifests/function/thanos-operator/helmrelease.yaml
index ce812c815..bd1aa566c 100644
--- a/manifests/function/thanos-operator/helmrelease.yaml
+++ b/manifests/function/thanos-operator/helmrelease.yaml
@@ -7,11 +7,9 @@ spec:
   interval: 5m
   chart:
     spec:
-      chart: thanos-operator
       sourceRef:
         kind: HelmRepository
-        name: banzaicloud
-    version: 0.1.0
+        name: thanos
     interval: 1m
   wait: false
   timeout: 5m
diff --git a/manifests/function/thanos-operator/helmrepository.yaml b/manifests/function/thanos-operator/helmrepository.yaml
index 7a1eced55..0b7ca91b9 100644
--- a/manifests/function/thanos-operator/helmrepository.yaml
+++ b/manifests/function/thanos-operator/helmrepository.yaml
@@ -1,7 +1,6 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
-  name: banzaicloud
+  name: thanos
 spec:
-  url: https://kubernetes-charts.banzaicloud.com
   interval: 10m
diff --git a/manifests/function/thanos-operator/replacements/kustomization.yaml b/manifests/function/thanos-operator/replacements/kustomization.yaml
new file mode 100644
index 000000000..ee1becf0d
--- /dev/null
+++ b/manifests/function/thanos-operator/replacements/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+  - versions.yaml
diff --git a/manifests/function/thanos-operator/replacements/versions.yaml b/manifests/function/thanos-operator/replacements/versions.yaml
new file mode 100644
index 000000000..f9a5ee590
--- /dev/null
+++ b/manifests/function/thanos-operator/replacements/versions.yaml
@@ -0,0 +1,51 @@
+apiVersion: airshipit.org/v1alpha1
+kind: ReplacementTransformer
+metadata:
+  name: thanos-versions-replacements
+  annotations:
+    config.kubernetes.io/function: |-
+      container:
+        image: quay.io/airshipit/replacement-transformer:latest
+replacements:
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.helm_repositories.thanos}"
+  target:
+    objref:
+      kind: HelmRepository
+      name: thanos
+    fieldrefs: ["{.spec}"]
+
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.thanos.chart}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: thanos-operator
+    fieldrefs: ["{.spec.chart.spec.chart}"]
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.charts.thanos.version}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: thanos-operator
+    fieldrefs: ["{.spec.chart.version}"]
+
+- source:
+    objref:
+      kind: VersionsCatalogue
+      name: versions-treasuremap
+    fieldref: "{.spec.images.thanos}"
+  target:
+    objref:
+      kind: HelmRelease
+      name: thanos-operator
+    fieldrefs: ["{.spec.values.image}"]
diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
index b567ce621..8c0e725f1 100644
--- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
+++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml
@@ -15,6 +15,8 @@ spec:
       url: https://kubernetes-charts.banzaicloud.com
     minio:
       url: https://helm.min.io
+    thanos:
+      url: https://kubernetes-charts.banzaicloud.com
 
   charts:
     grafana:
@@ -32,6 +34,9 @@ spec:
     minio:
       chart: minio
       version: 8.0.9
+    thanos:
+      chart: thanos-operator
+      version: 0.1.0
 
   images:
     grafana:
@@ -89,3 +94,6 @@ spec:
     sip:
       kube-rbac-proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
       manager: quay.io/airshipit/sip:51e7ff85d617c0e94fa98920fdbacce3ad9e6bc0
+    thanos:
+      repository: banzaicloud/thanos-operator
+      tag: latest