diff --git a/thanos/README.md b/thanos/README.md
index 4b4b6ded1..a4cacdb95 100644
--- a/thanos/README.md
+++ b/thanos/README.md
@@ -369,6 +369,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.query.containerLabels | object | `{}` | Labels to add to the Thanos Query container |
 | thanos.query.deploymentLabels | object | `{}` | Labels to add to the Thanos Query deployment |
 | thanos.query.enabled | bool | `true` | Enable Thanos Query component |
+| thanos.query.engine | bool | `false` | Enable experimental Thanos PromQL engine |
 | thanos.query.ingress.annotations | object | `{}` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. For a full list of possible ingress annotations, please see ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md |
 | thanos.query.ingress.enabled | bool | `false` | Enable ingress controller resource |
 | thanos.query.ingress.grpc.annotations | object | `{}` | Additional annotations for the Ingress resource.(GRPC) To enable certificate autogeneration, place here your cert-manager annotations. For a full list of possible ingress annotations, please see ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md |
@@ -387,7 +388,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.query.plutonoDatasource.isDefault | bool | `false` | set datasource as default for Plutono |
 | thanos.query.plutonoDatasource.selector | object | `{}` | Label selectors for the Plutono sidecar to detect this datasource. |
 | thanos.query.replicaLabel | string | `"prometheus_replica"` | Set Thanos Query replica-label for Prometheus replicas |
-| thanos.query.replicas | string | `nil` | Number of Thanos Query replicas to deploy |
+| thanos.query.replicas | int | `1` | Number of Thanos Query replicas to deploy |
 | thanos.query.resources | object | <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre> | Resource requests and limits for the Thanos Query container. |
 | thanos.query.serviceAnnotations | object | `{}` | Service specific annotations to add to the Thanos Query service in addition to its already configured annotations. |
 | thanos.query.serviceLabels | object | `{}` | Labels to add to the Thanos Query service |
@@ -431,6 +432,7 @@ If Blackbox-exporter is enabled and store endpoints are provided, this Thanos de
 | thanos.store.enabled | bool | `true` | Enable Thanos Store component |
 | thanos.store.indexCacheSize | string | 1GB | Set Thanos Store index-cache-size |
 | thanos.store.logLevel | string | info | Thanos Store log level |
+| thanos.store.replicas | int | `1` | Number of Thanos Store replcias |
 | thanos.store.resources | object | <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre> | Resource requests and limits for the Thanos Store container. |
 | thanos.store.serviceAnnotations | object | `{}` | Service specific annotations to add to the Thanos Store service in addition to its already configured annotations. |
 | thanos.store.serviceLabels | object | `{}` | Labels to add to the Thanos Store service |
\ No newline at end of file
diff --git a/thanos/charts/Chart.yaml b/thanos/charts/Chart.yaml
index ad19a7798..4f15baed0 100644
--- a/thanos/charts/Chart.yaml
+++ b/thanos/charts/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 name: thanos
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 0.7.2
+version: 0.7.3
 keywords:
   - thanos
   - storage
diff --git a/thanos/charts/templates/query/deployment.yaml b/thanos/charts/templates/query/deployment.yaml
index b7b28a9e1..28614356a 100644
--- a/thanos/charts/templates/query/deployment.yaml
+++ b/thanos/charts/templates/query/deployment.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ include "release.name" . }}-query
 spec:
   progressDeadlineSeconds: 600
-  replicas: {{ default 1 .Values.thanos.query.replicas }}
+  replicas: {{ .Values.thanos.query.replicas }}
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -61,6 +61,9 @@ spec:
         - --grpc-client-tls-key=/etc/tls/client/tls.key
         - --grpc-client-tls-secure
         {{- end }}
+        {{- if .Values.thanos.query.engine }}
+        - --query.promql-engine=thanos
+        {{- end }}
         image: "{{ .Values.thanos.image.repository }}:{{ .Values.thanos.image.tag }}"
         imagePullPolicy: {{ default "IfNotPresent" .Values.thanos.image.pullPolicy }}
         livenessProbe:
diff --git a/thanos/charts/templates/store/deployment.yaml b/thanos/charts/templates/store/deployment.yaml
index badc33664..980dc0230 100644
--- a/thanos/charts/templates/store/deployment.yaml
+++ b/thanos/charts/templates/store/deployment.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- end }}
   name: {{ include "release.name" . }}-store
 spec:
-  replicas: 1
+  replicas: {{ .Values.thanos.store.replicas }}
   selector:
     matchLabels:
       app.kubernetes.io/managed-by: {{ include "release.name" . }}
diff --git a/thanos/charts/values.yaml b/thanos/charts/values.yaml
index 73d05106d..55a0c3c29 100644
--- a/thanos/charts/values.yaml
+++ b/thanos/charts/values.yaml
@@ -68,8 +68,11 @@ thanos:
     # -- Enable Thanos Query component
     enabled: true
 
+    # -- Enable experimental Thanos PromQL engine
+    engine: false
+
     # -- Number of Thanos Query replicas to deploy
-    replicas:
+    replicas: 1
 
     # -- Thanos Query log level
     # @default -- info
@@ -215,6 +218,9 @@ thanos:
     # -- Enable Thanos Store component
     enabled: true
 
+    # -- Number of Thanos Store replcias
+    replicas: 1
+
     # -- Resource requests and limits for the Thanos Store container.
     # @default -- <pre>ressources:<br>  requests:<br>    memory:<br>    cpu:<br>  limits:<br>    memory:<br>    cpu:<br></pre>
     resources:
diff --git a/thanos/plugindefinition.yaml b/thanos/plugindefinition.yaml
index 0260e6050..fefa23a4b 100644
--- a/thanos/plugindefinition.yaml
+++ b/thanos/plugindefinition.yaml
@@ -6,12 +6,12 @@ kind: ClusterPluginDefinition
 metadata:
   name: thanos
 spec:
-  version: 0.7.2
+  version: 0.7.3
   description: thanos
   helmChart:
     name: thanos
     repository: "oci://ghcr.io/cloudoperators/greenhouse-extensions/charts"
-    version: 0.7.2
+    version: 0.7.3
   options:
     - default: null
       description: CLI param for Thanos Query