diff --git a/deploy/templates/nstemplatetiers/advanced/based_on_tier.yaml b/deploy/templates/nstemplatetiers/advanced/based_on_tier.yaml
index 5f1ff948c..40c789f34 100644
--- a/deploy/templates/nstemplatetiers/advanced/based_on_tier.yaml
+++ b/deploy/templates/nstemplatetiers/advanced/based_on_tier.yaml
@@ -1,8 +1,8 @@
 from: base
 parameters:
 - name: MEMORY_LIMIT
-  value: "16Gi"
+  value: "32Gi"
 - name: MEMORY_REQUEST
-  value: "16Gi"
+  value: "32Gi"
 - name: IDLER_TIMEOUT_SECONDS
   value: 0
diff --git a/deploy/templates/nstemplatetiers/base/cluster.yaml b/deploy/templates/nstemplatetiers/base/cluster.yaml
index bee23b21d..2fcdf9724 100644
--- a/deploy/templates/nstemplatetiers/base/cluster.yaml
+++ b/deploy/templates/nstemplatetiers/base/cluster.yaml
@@ -10,13 +10,13 @@ objects:
   spec:
     quota:
       hard:
-        limits.cpu: 20000m
+        limits.cpu: 40000m
         limits.memory: ${MEMORY_LIMIT}
-        limits.ephemeral-storage: 7Gi
-        requests.cpu: 1750m
+        limits.ephemeral-storage: 15Gi
+        requests.cpu: 6000m
         requests.memory: ${MEMORY_REQUEST}
         requests.storage: 40Gi
-        requests.ephemeral-storage: 7Gi
+        requests.ephemeral-storage: 15Gi
         count/persistentvolumeclaims: "5"
     selector:
       annotations: null
@@ -153,6 +153,6 @@ parameters:
   # 12 hours
   value: "43200"
 - name: MEMORY_LIMIT
-  value: "7Gi"
+  value: "28Gi"
 - name: MEMORY_REQUEST
-  value: "7Gi"
+  value: "28Gi"
diff --git a/deploy/templates/nstemplatetiers/base/ns_dev.yaml b/deploy/templates/nstemplatetiers/base/ns_dev.yaml
index 8ac67bee5..ddaafeffc 100644
--- a/deploy/templates/nstemplatetiers/base/ns_dev.yaml
+++ b/deploy/templates/nstemplatetiers/base/ns_dev.yaml
@@ -72,7 +72,7 @@ objects:
     - type: "Container"
       default:
         cpu: 1000m
-        memory: 750Mi
+        memory: 1024Mi
       defaultRequest:
         cpu: 10m
         memory: 64Mi
diff --git a/deploy/templates/nstemplatetiers/base/ns_stage.yaml b/deploy/templates/nstemplatetiers/base/ns_stage.yaml
index bc1dda573..0f2e43a54 100644
--- a/deploy/templates/nstemplatetiers/base/ns_stage.yaml
+++ b/deploy/templates/nstemplatetiers/base/ns_stage.yaml
@@ -72,7 +72,7 @@ objects:
     - type: "Container"
       default:
         cpu: 1000m
-        memory: 750Mi
+        memory: 1024Mi
       defaultRequest:
         cpu: 10m
         memory: 64Mi
diff --git a/deploy/templates/nstemplatetiers/baselarge/based_on_tier.yaml b/deploy/templates/nstemplatetiers/baselarge/based_on_tier.yaml
index d228dc380..e30b2c8a7 100644
--- a/deploy/templates/nstemplatetiers/baselarge/based_on_tier.yaml
+++ b/deploy/templates/nstemplatetiers/baselarge/based_on_tier.yaml
@@ -1,6 +1,6 @@
 from: base
 parameters:
 - name: MEMORY_LIMIT
-  value: "16Gi"
+  value: "32Gi"
 - name: MEMORY_REQUEST
-  value: "16Gi"
+  value: "32Gi"