diff --git a/jsonnet/kube-prometheus/addons/strip-limits.libsonnet b/jsonnet/kube-prometheus/addons/strip-limits.libsonnet
index fbd40200a47c5592783cc75d4eb2a94dbe63b68b..83c5f77b8ccc62169d63213ddaeca1f5456ac382 100644
--- a/jsonnet/kube-prometheus/addons/strip-limits.libsonnet
+++ b/jsonnet/kube-prometheus/addons/strip-limits.libsonnet
@@ -1,19 +1,32 @@
 // Strips spec.containers[].limits for certain containers
 // https://github.com/prometheus-operator/kube-prometheus/issues/72
+
 {
-  _config+:: {
-    resources+:: {
-      'addon-resizer'+: {
-        limits: {},
-      },
-      'kube-rbac-proxy'+: {
-        limits: {},
-      },
-      'kube-state-metrics'+: {
-        limits: {},
+  local noLimit(c) =
+    //if std.objectHas(c, 'resources') && c.name != 'kube-state-metrics'
+    if c.name != 'kube-state-metrics'
+    then c { resources+: { limits: {} } }
+    else c,
+
+  nodeExporter+: {
+    daemonset+: {
+      spec+: {
+        template+: {
+          spec+: {
+            containers: std.map(noLimit, super.containers),
+          },
+        },
       },
-      'node-exporter'+: {
-        limits: {},
+    },
+  },
+  kubeStateMetrics+: {
+    deployment+: {
+      spec+: {
+        template+: {
+          spec+: {
+            containers: std.map(noLimit, super.containers),
+          },
+        },
       },
     },
   },