diff --git a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
index e066b98464b84fac1241eb611f84a121b3c76d42..06164dd23c20c3ea17161de1b973c406aacc9b05 100644
--- a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
+++ b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
@@ -126,7 +126,9 @@ function(params) {
               action: 'drop',
               regex: '(' + std.join('|',
                                     [
+                                      'container_fs_.*',  // add filesystem read/write data (nodes*disks*services*4)
                                       'container_spec_.*',  // everything related to cgroup specification and thus static data (nodes*services*5)
+                                      'container_blkio_device_usage_total',  // useful for containers, but not for system services (nodes*disks*services*operations*2)
                                       'container_file_descriptors',  // file descriptors limits and global numbers are exposed via (nodes*services)
                                       'container_sockets',  // used sockets in cgroup. Usually not important for system services (nodes*services)
                                       'container_threads_max',  // max number of threads in cgroup. Usually for system services it is not limited (nodes*services)
@@ -135,14 +137,6 @@ function(params) {
                                       'container_last_seen',  // not needed as system services are always running (nodes*services)
                                     ]) + ');;',
             },
-            {
-              sourceLabels: ['__name__', 'container'],
-              action: 'drop',
-              regex: '(' + std.join('|',
-                                    [
-                                      'container_blkio_device_usage_total',
-                                    ]) + ');.+',
-            },
           ],
         },
         {
diff --git a/manifests/kubernetes-serviceMonitorKubelet.yaml b/manifests/kubernetes-serviceMonitorKubelet.yaml
index fb285df285e6f942cf39fe8f6b0f9573f1cbbe68..ea0502742e41ab2a90f84f7e9449668d01cbccac 100644
--- a/manifests/kubernetes-serviceMonitorKubelet.yaml
+++ b/manifests/kubernetes-serviceMonitorKubelet.yaml
@@ -61,16 +61,11 @@ spec:
       sourceLabels:
       - __name__
     - action: drop
-      regex: (container_spec_.*|container_file_descriptors|container_sockets|container_threads_max|container_threads|container_start_time_seconds|container_last_seen);;
+      regex: (container_fs_.*|container_spec_.*|container_blkio_device_usage_total|container_file_descriptors|container_sockets|container_threads_max|container_threads|container_start_time_seconds|container_last_seen);;
       sourceLabels:
       - __name__
       - pod
       - namespace
-    - action: drop
-      regex: (container_blkio_device_usage_total);.+
-      sourceLabels:
-      - __name__
-      - container
     path: /metrics/cadvisor
     port: https-metrics
     relabelings: