diff --git a/k8s/helmfile/env/production/elasticsearch-2.values.yaml.gotmpl b/k8s/helmfile/env/production/elasticsearch-2.values.yaml.gotmpl
index 006c52fe8..9baaef55d 100644
--- a/k8s/helmfile/env/production/elasticsearch-2.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/elasticsearch-2.values.yaml.gotmpl
@@ -19,7 +19,6 @@ master:
       cpu: "300m"
       memory: "8Gi"
     limits:
-      cpu: null
       memory: "8Gi"
   persistence:
     enabled: true
@@ -43,7 +42,6 @@ data:
       cpu: "300m"
       memory: "18Gi"
     limits:
-      cpu: null
       memory: "18Gi"
   persistence:
     enabled: true
diff --git a/k8s/helmfile/env/production/ingress-nginx.values.yaml.gotmpl b/k8s/helmfile/env/production/ingress-nginx.values.yaml.gotmpl
index 8769305ed..9f4c43643 100644
--- a/k8s/helmfile/env/production/ingress-nginx.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/ingress-nginx.values.yaml.gotmpl
@@ -7,8 +7,6 @@ controller:
     requests:
       cpu: 0.100
       memory: 150Mi
-    limits:
-      cpu: null
   config:
     http-snippet: >-
       limit_req_zone $host zone=limit_host:10m rate=15r/s;
diff --git a/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
index ac0e106ca..c3ecfef59 100644
--- a/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
@@ -61,26 +61,22 @@ resources:
       cpu: 500m
       memory: 1600Mi
     limits:
-      cpu: null
       memory: 2800Mi
   webapi:
     requests:
       cpu: 200m
       memory: 250Mi
     limits:
-      cpu: null
       memory: 1200Mi
   alpha:
     requests:
       cpu: 50m
       memory: 40Mi
     limits:
-      cpu: null
       memory: 600Mi
   backend:
     requests:
       cpu: 500m
       memory: 600Mi
     limits:
-      cpu: null
       memory: 1200Mi
diff --git a/k8s/helmfile/env/production/platform-nginx.values.yaml.gotmpl b/k8s/helmfile/env/production/platform-nginx.values.yaml.gotmpl
index 18688f955..527391ca2 100644
--- a/k8s/helmfile/env/production/platform-nginx.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/platform-nginx.values.yaml.gotmpl
@@ -2,7 +2,6 @@ replicaCount: 3
 
 resources:
   limits:
-    cpu: null
     memory: 128Mi
   requests:
      cpu: 20m
diff --git a/k8s/helmfile/env/production/queryservice-gateway.values.yaml.gotmpl b/k8s/helmfile/env/production/queryservice-gateway.values.yaml.gotmpl
index 5fc19356b..5e501c3a3 100644
--- a/k8s/helmfile/env/production/queryservice-gateway.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/queryservice-gateway.values.yaml.gotmpl
@@ -11,5 +11,4 @@ resources:
     cpu: 125m
     memory: 128Mi
   limits:
-    cpu: null
     memory: 256Mi
diff --git a/k8s/helmfile/env/production/queryservice-ui.values.yaml.gotmpl b/k8s/helmfile/env/production/queryservice-ui.values.yaml.gotmpl
index 3f4b9ee01..1c841d2b6 100644
--- a/k8s/helmfile/env/production/queryservice-ui.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/queryservice-ui.values.yaml.gotmpl
@@ -8,5 +8,4 @@ resources:
     cpu: 1m
     memory: 10Mi
   limits:
-    cpu: null
     memory: 25Mi
diff --git a/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl b/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl
index 9a64a01ab..487d40357 100644
--- a/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl
@@ -19,5 +19,4 @@ resources:
     cpu: 80m
     memory: 256Mi
   limits:
-    cpu: null
     memory: 512Mi
diff --git a/k8s/helmfile/env/production/queryservice.values.yaml.gotmpl b/k8s/helmfile/env/production/queryservice.values.yaml.gotmpl
index 60bfbbd98..f9c06cb61 100644
--- a/k8s/helmfile/env/production/queryservice.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/queryservice.values.yaml.gotmpl
@@ -11,7 +11,6 @@ resources:
     cpu: 0.5
     memory: "3048Mi"
   limits:
-    cpu: null
     memory: "4072Mi"
 
 persistence:
diff --git a/k8s/helmfile/env/production/superset.values.yaml.gotmpl b/k8s/helmfile/env/production/superset.values.yaml.gotmpl
index 32a558be7..8be2be1eb 100644
--- a/k8s/helmfile/env/production/superset.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/superset.values.yaml.gotmpl
@@ -9,5 +9,4 @@ resources:
     cpu: 500m
     memory: 8Gi
   limits:
-    cpu: null
     memory: 8Gi
diff --git a/k8s/helmfile/env/production/tool-cradle.values.yaml.gotmpl b/k8s/helmfile/env/production/tool-cradle.values.yaml.gotmpl
index 3e8da792b..50285e770 100644
--- a/k8s/helmfile/env/production/tool-cradle.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/tool-cradle.values.yaml.gotmpl
@@ -8,7 +8,6 @@ resources:
     cpu: 1m
     memory: 20Mi
   limits:
-    cpu: null
     memory: 60Mi
 
 replicaCount: 1
diff --git a/k8s/helmfile/env/production/tool-quickstatements.values.yaml.gotmpl b/k8s/helmfile/env/production/tool-quickstatements.values.yaml.gotmpl
index 0ada8cb7e..fcf27fcff 100644
--- a/k8s/helmfile/env/production/tool-quickstatements.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/tool-quickstatements.values.yaml.gotmpl
@@ -21,5 +21,4 @@ resources:
     cpu: 1m
     memory: 40Mi
   limits:
-    cpu: null
     memory: 100Mi
diff --git a/k8s/helmfile/env/production/tool-widar.values.yaml.gotmpl b/k8s/helmfile/env/production/tool-widar.values.yaml.gotmpl
index ddc4f2a40..e74df742e 100644
--- a/k8s/helmfile/env/production/tool-widar.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/tool-widar.values.yaml.gotmpl
@@ -11,7 +11,6 @@ resources:
     cpu: 1m
     memory: 18Mi
   limits:
-    cpu: null
     memory: 50Mi
 
 php:
diff --git a/k8s/helmfile/env/staging/elasticsearch-2.values.yaml.gotmpl b/k8s/helmfile/env/staging/elasticsearch-2.values.yaml.gotmpl
index 12732436e..9e7197c5f 100644
--- a/k8s/helmfile/env/staging/elasticsearch-2.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/elasticsearch-2.values.yaml.gotmpl
@@ -13,7 +13,6 @@ master:
       cpu: "250m"
       memory: "1Gi"
     limits:
-      cpu: null
       memory: "1Gi"
   persistence:
     enabled: true
@@ -29,7 +28,6 @@ data:
       cpu: "500m"
       memory: "8Gi"
     limits:
-      cpu: null
       memory: "8Gi"
   persistence:
     enabled: true
diff --git a/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
index 04b9ba9fa..3c8953b46 100644
--- a/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
@@ -23,26 +23,22 @@ resources:
       cpu: 100m
       memory: 250Mi
     limits:
-      cpu: null
       memory: 750Mi
   webapi:
     requests:
       cpu: 100m
       memory: 125Mi
     limits:
-      cpu: null
       memory: 1200Mi
   alpha:
     requests:
       cpu: 50m
       memory: 40Mi
     limits:
-      cpu: null
       memory: 600Mi
   backend:
     requests:
       cpu: 125m
       memory: 200Mi
     limits:
-      cpu: null
       memory: 1200Mi
diff --git a/k8s/helmfile/env/staging/queryservice-gateway.values.yaml.gotmpl b/k8s/helmfile/env/staging/queryservice-gateway.values.yaml.gotmpl
index 1d9b98e0e..5d2026d59 100644
--- a/k8s/helmfile/env/staging/queryservice-gateway.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/queryservice-gateway.values.yaml.gotmpl
@@ -6,5 +6,4 @@ resources:
     cpu: 60m
     memory: 50Mi
   limits:
-    cpu: null
     memory: 100Mi
diff --git a/k8s/helmfile/env/staging/queryservice.values.yaml.gotmpl b/k8s/helmfile/env/staging/queryservice.values.yaml.gotmpl
index 3df5eab1a..daa936eee 100644
--- a/k8s/helmfile/env/staging/queryservice.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/queryservice.values.yaml.gotmpl
@@ -8,7 +8,6 @@ resources:
     cpu: 0.5
     memory: "2048Mi"
   limits:
-    cpu: null
     memory: "3072Mi"
 
 persistence:
diff --git a/k8s/helmfile/env/staging/superset.values.yaml.gotmpl b/k8s/helmfile/env/staging/superset.values.yaml.gotmpl
index b77c7eef9..bcc24e7c7 100644
--- a/k8s/helmfile/env/staging/superset.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/superset.values.yaml.gotmpl
@@ -3,5 +3,4 @@ resources:
     cpu: 100m
     memory: 750Mi
   limits:
-    cpu: 250m
     memory: 750Mi