diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
index ff713e8e..bf8f02d2 100644
--- a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -23,9 +23,8 @@ spec:
     cleanupOnFail: true
     crds: CreateReplace
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   dependsOn:
     - name: openebs
       namespace: openebs-system
@@ -107,13 +106,13 @@ spec:
         enabled: true
       thanosServiceMonitor:
         enabled: true
-      thanosServiceExternal:
-        enabled: true
-        type: LoadBalancer
-        annotations:
-          external-dns.alpha.kubernetes.io/hostname: thanos.jahanson.tech
-          io.cilium/lb-ipam-ips: 10.45.0.6
-        externalTrafficPolicy: Cluster
+      # thanosServiceExternal:
+      #   enabled: true
+      #   type: LoadBalancer
+      #   annotations:
+      #     external-dns.alpha.kubernetes.io/hostname: thanos.jahanson.tech
+      #     io.cilium/lb-ipam-ips: 10.45.0.6
+      #   externalTrafficPolicy: Cluster
       prometheusSpec:
         podMetadata:
           annotations:
@@ -129,7 +128,7 @@ spec:
         enableAdminAPI: true
         walCompression: true
         enableFeatures:
-          - auto-gomaxprocs
+          - auto-gomemlimit
           - memory-snapshot-on-shutdown
           - new-service-discovery-manager
         image:
@@ -191,6 +190,8 @@ spec:
       forceDeployDashboards: true
       sidecar:
         dashboards:
+          annotations:
+            grafana_folder: Kubernetes
           multicluster:
             etcd:
               enabled: true
\ No newline at end of file
diff --git a/kubernetes/apps/observability/thanos/app/helmrelease.yaml b/kubernetes/apps/observability/thanos/app/helmrelease.yaml
index 6ae9d125..b141eef8 100644
--- a/kubernetes/apps/observability/thanos/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/thanos/app/helmrelease.yaml
@@ -74,10 +74,6 @@ spec:
         enabled: true
         storageClass: openebs-hostpath
         size: 10Gi
-    query:
-      replicas: 2
-      extraArgs: ["--alert.query-url=https://thanos.jahanson.tech"]
-      additionalStores: ["thanos.jahanson.tech:10901"]
     queryFrontend:
       enabled: true
       replicas: 2