diff --git a/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml b/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
index 4b3d84c1ef..665077c9a2 100755
--- a/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
+++ b/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
@@ -322,8 +322,8 @@ parameters:
 - name: REPLICAS
   value: "1"
 - name: CPU_REQUEST
-  value: "15"
+  value: "2"
 - name: MEMORY_LIMIT
-  value: 200Gi
+  value: 24Gi
 - name: MEMORY_REQUEST
-  value: 200Gi
+  value: 24Gi
diff --git a/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml b/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
index c925e0e520..ac5c1b2954 100755
--- a/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
+++ b/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
@@ -376,8 +376,8 @@ objects:
           name: hashmod-config
         - configMap:
             defaultMode: 511
-            name: thanos-store
-          name: hashmod-config-template-default
+            name: hashmod-config-template-default
+          name: hashmod-config-template
     updateStrategy: {}
     volumeClaimTemplates:
     - metadata:
diff --git a/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml b/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
index 8e48bd2736..9bb9bcfc33 100755
--- a/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
+++ b/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
@@ -322,8 +322,8 @@ parameters:
 - name: REPLICAS
   value: "1"
 - name: CPU_REQUEST
-  value: "15"
+  value: "2"
 - name: MEMORY_LIMIT
-  value: 200Gi
+  value: 24Gi
 - name: MEMORY_REQUEST
-  value: 200Gi
+  value: 24Gi
diff --git a/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml b/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
index 6f26d6d096..98b86ab575 100755
--- a/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
+++ b/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
@@ -376,8 +376,8 @@ objects:
           name: hashmod-config
         - configMap:
             defaultMode: 511
-            name: thanos-store
-          name: hashmod-config-template-rhel
+            name: hashmod-config-template-rhel
+          name: hashmod-config-template
     updateStrategy: {}
     volumeClaimTemplates:
     - metadata:
diff --git a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
index a87df4d6bf..e670f9477f 100755
--- a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
+++ b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
@@ -322,8 +322,8 @@ parameters:
 - name: REPLICAS
   value: "1"
 - name: CPU_REQUEST
-  value: "15"
+  value: "2"
 - name: MEMORY_LIMIT
-  value: 200Gi
+  value: 24Gi
 - name: MEMORY_REQUEST
-  value: 200Gi
+  value: 24Gi
diff --git a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
index 980a70f86f..5d8bd802d6 100755
--- a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
+++ b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
@@ -376,8 +376,8 @@ objects:
           name: hashmod-config
         - configMap:
             defaultMode: 511
-            name: thanos-store
-          name: hashmod-config-template-telemeter
+            name: hashmod-config-template-telemeter
+          name: hashmod-config-template
     updateStrategy: {}
     volumeClaimTemplates:
     - metadata:
diff --git a/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml b/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
index 4b3d84c1ef..665077c9a2 100755
--- a/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
+++ b/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
@@ -322,8 +322,8 @@ parameters:
 - name: REPLICAS
   value: "1"
 - name: CPU_REQUEST
-  value: "15"
+  value: "2"
 - name: MEMORY_LIMIT
-  value: 200Gi
+  value: 24Gi
 - name: MEMORY_REQUEST
-  value: 200Gi
+  value: 24Gi
diff --git a/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml b/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml
index c925e0e520..ac5c1b2954 100755
--- a/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml
+++ b/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml
@@ -376,8 +376,8 @@ objects:
           name: hashmod-config
         - configMap:
             defaultMode: 511
-            name: thanos-store
-          name: hashmod-config-template-default
+            name: hashmod-config-template-default
+          name: hashmod-config-template
     updateStrategy: {}
     volumeClaimTemplates:
     - metadata:
diff --git a/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml b/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
index 8e48bd2736..9bb9bcfc33 100755
--- a/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
+++ b/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
@@ -322,8 +322,8 @@ parameters:
 - name: REPLICAS
   value: "1"
 - name: CPU_REQUEST
-  value: "15"
+  value: "2"
 - name: MEMORY_LIMIT
-  value: 200Gi
+  value: 24Gi
 - name: MEMORY_REQUEST
-  value: 200Gi
+  value: 24Gi
diff --git a/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml b/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
index 6f26d6d096..98b86ab575 100755
--- a/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
+++ b/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
@@ -376,8 +376,8 @@ objects:
           name: hashmod-config
         - configMap:
             defaultMode: 511
-            name: thanos-store
-          name: hashmod-config-template-rhel
+            name: hashmod-config-template-rhel
+          name: hashmod-config-template
     updateStrategy: {}
     volumeClaimTemplates:
     - metadata:
diff --git a/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml b/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
index a87df4d6bf..e670f9477f 100755
--- a/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
+++ b/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
@@ -322,8 +322,8 @@ parameters:
 - name: REPLICAS
   value: "1"
 - name: CPU_REQUEST
-  value: "15"
+  value: "2"
 - name: MEMORY_LIMIT
-  value: 200Gi
+  value: 24Gi
 - name: MEMORY_REQUEST
-  value: 200Gi
+  value: 24Gi
diff --git a/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml b/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
index 980a70f86f..5d8bd802d6 100755
--- a/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
+++ b/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
@@ -376,8 +376,8 @@ objects:
           name: hashmod-config
         - configMap:
             defaultMode: 511
-            name: thanos-store
-          name: hashmod-config-template-telemeter
+            name: hashmod-config-template-telemeter
+          name: hashmod-config-template
     updateStrategy: {}
     volumeClaimTemplates:
     - metadata:
diff --git a/services_go/observatorium/metrics.go b/services_go/observatorium/metrics.go
index 0a79a5792c..0df7f53275 100644
--- a/services_go/observatorium/metrics.go
+++ b/services_go/observatorium/metrics.go
@@ -241,9 +241,9 @@ func (o ObservatoriumMetrics) makeTenantReceiveIngestor(instanceCfg *Observatori
 	ingestor.VolumeType = "gp2"
 	ingestor.VolumeSize = "50Gi"
 	delete(ingestor.PodResources.Limits, corev1.ResourceCPU)
-	ingestor.PodResources.Requests[corev1.ResourceCPU] = resource.MustParse("15")
-	ingestor.PodResources.Requests[corev1.ResourceMemory] = resource.MustParse("200Gi")
-	ingestor.PodResources.Limits[corev1.ResourceMemory] = resource.MustParse("200Gi")
+	ingestor.PodResources.Requests[corev1.ResourceCPU] = resource.MustParse("2")
+	ingestor.PodResources.Requests[corev1.ResourceMemory] = resource.MustParse("24Gi")
+	ingestor.PodResources.Limits[corev1.ResourceMemory] = resource.MustParse("24Gi")
 	ingestor.Env = deleteObjStoreEnv(ingestor.Env) // delete the default objstore env vars
 	ingestor.Env = append(ingestor.Env, objStoreEnvVars(instanceCfg.ObjStoreSecret)...)
 	ingestor.Sidecars = []k8sutil.ContainerProvider{makeJaegerAgent("observatorium-tools")}
@@ -530,11 +530,11 @@ func (o ObservatoriumMetrics) makeStore(instanceCfg *ObservatoriumMetricsInstanc
 			EmptyDir: &corev1.EmptyDirVolumeSource{},
 		},
 	}, corev1.Volume{
-		Name: hasmodCMName,
+		Name: "hashmod-config-template",
 		VolumeSource: corev1.VolumeSource{
 			ConfigMap: &corev1.ConfigMapVolumeSource{
 				LocalObjectReference: corev1.LocalObjectReference{
-					Name: storeStatefulSet.CommonLabels[k8sutil.NameLabel],
+					Name: hasmodCMName,
 				},
 				DefaultMode: &defaultMode,
 			},