diff --git a/collector/queries.go b/collector/queries.go
index fd433316a..ba5c769c7 100644
--- a/collector/queries.go
+++ b/collector/queries.go
@@ -30,7 +30,7 @@ var (
 	nodeQueries = &querys{
 		query{
 			Name:        "node-allocatable-cpu-cores",
-			QueryString: "kube_node_status_allocatable_cpu_cores * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
+			QueryString: "kube_node_status_allocatable{resource='cpu'} * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
 			MetricKey:   staticFields{"node": "node", "provider_id": "provider_id"},
 			QueryValue: &saveQueryValue{
 				ValName:         "node-allocatable-cpu-cores",
@@ -42,7 +42,7 @@ var (
 		},
 		query{
 			Name:        "node-allocatable-memory-bytes",
-			QueryString: "kube_node_status_allocatable_memory_bytes * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
+			QueryString: "kube_node_status_allocatable{resource='memory'} * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
 			MetricKey:   staticFields{"node": "node", "provider_id": "provider_id"},
 			QueryValue: &saveQueryValue{
 				ValName:         "node-allocatable-memory-bytes",
@@ -54,7 +54,7 @@ var (
 		},
 		query{
 			Name:        "node-capacity-cpu-cores",
-			QueryString: "kube_node_status_capacity_cpu_cores * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
+			QueryString: "kube_node_status_capacity{resource='cpu'} * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
 			MetricKey:   staticFields{"node": "node", "provider_id": "provider_id"},
 			QueryValue: &saveQueryValue{
 				ValName:         "node-capacity-cpu-cores",
@@ -66,7 +66,7 @@ var (
 		},
 		query{
 			Name:        "node-capacity-memory-bytes",
-			QueryString: "kube_node_status_capacity_memory_bytes * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
+			QueryString: "kube_node_status_capacity{resource='memory'} * on(node) group_left(provider_id) max(kube_node_info) by (node, provider_id)",
 			MetricKey:   staticFields{"node": "node", "provider_id": "provider_id"},
 			QueryValue: &saveQueryValue{
 				ValName:         "node-capacity-memory-bytes",
@@ -141,7 +141,7 @@ var (
 	podQueries = &querys{
 		query{
 			Name:        "pod-limit-cpu-cores",
-			QueryString: "sum(kube_pod_container_resource_limits_cpu_cores) by (pod, namespace, node)",
+			QueryString: "sum(kube_pod_container_resource_limits{resource='cpu'}) by (pod, namespace, node)",
 			MetricKey:   staticFields{"pod": "pod", "namespace": "namespace", "node": "node"},
 			QueryValue: &saveQueryValue{
 				ValName:         "pod-limit-cpu-cores",
@@ -153,7 +153,7 @@ var (
 		},
 		query{
 			Name:        "pod-limit-memory-bytes",
-			QueryString: "sum(kube_pod_container_resource_limits_memory_bytes) by (pod, namespace, node)",
+			QueryString: "sum(kube_pod_container_resource_limits{resource='memory'}) by (pod, namespace, node)",
 			MetricKey:   staticFields{"pod": "pod", "namespace": "namespace", "node": "node"},
 			QueryValue: &saveQueryValue{
 				ValName:         "pod-limit-memory-bytes",
@@ -165,7 +165,7 @@ var (
 		},
 		query{
 			Name:        "pod-request-cpu-cores",
-			QueryString: "sum(kube_pod_container_resource_requests_cpu_cores) by (pod, namespace, node)",
+			QueryString: "sum(kube_pod_container_resource_requests{resource='cpu'}) by (pod, namespace, node)",
 			MetricKey:   staticFields{"pod": "pod", "namespace": "namespace", "node": "node"},
 			QueryValue: &saveQueryValue{
 				ValName:         "pod-request-cpu-cores",
@@ -177,7 +177,7 @@ var (
 		},
 		query{
 			Name:        "pod-request-memory-bytes",
-			QueryString: "sum(kube_pod_container_resource_requests_memory_bytes) by (pod, namespace, node)",
+			QueryString: "sum(kube_pod_container_resource_requests{resource='memory'}) by (pod, namespace, node)",
 			MetricKey:   staticFields{"pod": "pod", "namespace": "namespace", "node": "node"},
 			QueryValue: &saveQueryValue{
 				ValName:         "pod-request-memory-bytes",