diff --git a/src/exporters/utils.rs b/src/exporters/utils.rs
index 2c0e4c8a..f7fc64a0 100644
--- a/src/exporters/utils.rs
+++ b/src/exporters/utils.rs
@@ -136,8 +136,9 @@ pub fn get_docker_client() -> Result<Docker, std::io::Error> {
 
 #[cfg(feature = "containers")]
 pub fn get_kubernetes_client() -> Result<Kubernetes, KubernetesError> {
+    let kube_config_path = std::env::var("KUBECONFIG").ok();
     match Kubernetes::connect(
-        Some(String::from("/root/.kube/config")),
+        kube_config_path,
         None,
         None,
         None,
diff --git a/src/sensors/utils.rs b/src/sensors/utils.rs
index 2ba070ab..0020f9ac 100644
--- a/src/sensors/utils.rs
+++ b/src/sensors/utils.rs
@@ -428,6 +428,11 @@ impl ProcessTracker {
         }
         if container_id.contains("cri-containerd") {
             container_id = container_id.split(':').last().unwrap().to_string();
+            // cgroup name sometimes look like cri-containerd-[actual container_id] so we take
+            // that into account
+            if container_id.contains("cri-containerd") {
+                container_id = container_id.split('-').last().unwrap().to_string();
+            }
         }
         Ok(container_id)
     }