diff --git a/apps/monitoring/grafana.values.yaml b/apps/monitoring/grafana.values.yaml
index fea5038..c140449 100644
--- a/apps/monitoring/grafana.values.yaml
+++ b/apps/monitoring/grafana.values.yaml
@@ -31,7 +31,7 @@ datasources:
     datasources:
       - name: Thanos
         type: prometheus
-        url: http://thanos-querier.prometheus.svc:9090
+        url: http://thanos-querier.prometheus.svc:10902
         isDefault: true
       - name: Prometheus
         type: prometheus
diff --git a/infrastructure/prometheus/prometheus.yaml b/infrastructure/prometheus/prometheus.yaml
index f204142..f4e8f26 100644
--- a/infrastructure/prometheus/prometheus.yaml
+++ b/infrastructure/prometheus/prometheus.yaml
@@ -4,7 +4,7 @@ metadata:
   name: prometheus
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-knd: ClusterRole
+kind: ClusterRole
 metadata:
   name: prometheus
 rules:
@@ -52,26 +52,17 @@ spec:
     requests:
       memory: 400Mi
   retention: 730d
-  retentionSize: 50Gi
+  retentionSize: 3GiB
   serviceAccountName: prometheus
   enableAdminAPI: false
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
   thanos:
-    version: v0.33.0
+    version: v0.34.1
     objectStorageConfig:
       # loads the config from a secret named thanos-objstore-config in the same namespace
       key: thanos.yaml
       name: thanos-objstore-config
-  volumeClaimTemplate:
-    metadata:
-      name: prometheus-data
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 50Gi
 ---
 apiVersion: v1
 kind: Service
diff --git a/infrastructure/prometheus/thanos-query.deployment.yaml b/infrastructure/prometheus/thanos-query.deployment.yaml
index ded5f1e..8170495 100644
--- a/infrastructure/prometheus/thanos-query.deployment.yaml
+++ b/infrastructure/prometheus/thanos-query.deployment.yaml
@@ -52,16 +52,4 @@ spec:
     - name: grpc
       protocol: TCP
       port: 10901
-      targetPort: grpc
-metadata:
-  labels:
-    app: thanos-querier
-  name: thanos-querier
-spec:
-  ports:
-  - port: 9090
-    protocol: TCP
-    targetPort: http
-    name: http
-  selector:
-    app: thanos-querier
\ No newline at end of file
+      targetPort: grpc
\ No newline at end of file
diff --git a/infrastructure/prometheus/thanos-store.statefulset.yaml b/infrastructure/prometheus/thanos-store.statefulset.yaml
index f008164..4055317 100644
--- a/infrastructure/prometheus/thanos-store.statefulset.yaml
+++ b/infrastructure/prometheus/thanos-store.statefulset.yaml
@@ -1,33 +1,32 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
-  name: thanos-store-gateway
+  name: thanos-store
   labels:
-    app: thanos-store-gateway
+    app: thanos-store
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: thanos-store-gateway
-  serviceName: thanos-store-gateway
+      app: thanos-store
   template:
     metadata:
       labels:
-        app: thanos-store-gateway
+        app: thanos-store
         thanos-store-api: "true"
     spec:
       containers:
         - name: thanos
           image: thanos
           args:
-          - "store"
-          - "--log.level=debug"
-          - "--data-dir=/data"
-          - "--grpc-address=0.0.0.0:10901"
-          - "--http-address=0.0.0.0:10902"
-          - "--objstore.config-file=/etc/secret/thanos.yaml"
-          - "--index-cache-size=500MB"
-          - "--chunk-pool-size=500MB"
+          - store
+          - --log.level=debug
+          - --data-dir=/data
+          - --grpc-address=0.0.0.0:10901
+          - --http-address=0.0.0.0:10902
+          - --objstore.config-file=/etc/secret/thanos.yaml
+          - --index-cache-size=500MB
+          - --chunk-pool-size=500MB
           ports:
           - name: http
             containerPort: 10902
@@ -61,7 +60,6 @@ metadata:
     app.kubernetes.io/name: thanos-store
   name: thanos-store
 spec:
-  clusterIP: None
   ports:
   - name: grpc
     port: 10901
@@ -70,4 +68,4 @@ spec:
     port: 10902
     targetPort: 10902
   selector:
-    app: thanos-store-gateway
+    app: thanos-store