diff --git a/dashboards/kkp-kubernetes.yaml b/dashboards/kkp-kubernetes.yaml
index 99c399a..32fbc79 100644
--- a/dashboards/kkp-kubernetes.yaml
+++ b/dashboards/kkp-kubernetes.yaml
@@ -54,7 +54,7 @@ data:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "avg by (node_name) (sum by (node_name) (irate(node_cpu_seconds_total{job=\"node-exporter\", mode!=\"idle\", node_name=~\"$nodes\"}[2m]) * 100))",
+              "expr": "avg by (node_name) (100 - (irate(node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", node_name=~\"$nodes\"}[2m]) * 100))",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ node_name }}",
@@ -165,7 +165,7 @@ data:
           "tableColumn": "",
           "targets": [
             {
-              "expr": "avg (sum by (node_name) (irate(node_cpu_seconds_total{job=\"node-exporter\", mode!=\"idle\", node_name=~\"$nodes\"}[2m]) * 100))",
+              "expr": "avg (100 - (irate(node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", node_name=~\"$nodes\"}[2m]) * 100))",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A"
@@ -2273,7 +2273,7 @@ data:
               "refId": "B"
             },
             {
-              "expr": "sum (kube_pod_container_resource_limits_memory_bytes{job=\"kube-state-metrics\", namespace=\"$namespace\", pod=\"$pod\"})",
+              "expr": "sum (kube_pod_container_resource_limits{resource=\"memory\", job=\"kube-state-metrics\", namespace=\"$namespace\", pod=\"$pod\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Limit",
@@ -2376,7 +2376,7 @@ data:
               "refId": "B"
             },
             {
-              "expr": "sum by(container) (kube_pod_container_resource_limits_memory_bytes{job=\"kube-state-metrics\", namespace=\"$namespace\", pod=\"$pod\", container=~\"$container\"})",
+              "expr": "sum by(container) (kube_pod_container_resource_limits{resource=\"memory\", job=\"kube-state-metrics\", namespace=\"$namespace\", pod=\"$pod\", container=~\"$container\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "Limit: {{ container }}",
diff --git a/hack/generate-kkp-dashboards.sh b/hack/generate-kkp-dashboards.sh
index 116cf47..ae722dd 100755
--- a/hack/generate-kkp-dashboards.sh
+++ b/hack/generate-kkp-dashboards.sh
@@ -2,7 +2,7 @@
 
 KKP_REPO_DIR="${KKP_REPO_DIR:-}"
 KKP_REPO_URL="${KKP_REPO_URL:-https://github.com/kubermatic/kubermatic.git}"
-KKP_REPO_TAG="${KKP_REPO_TAG:-weekly-2021-33}"
+KKP_REPO_TAG="${KKP_REPO_TAG:-release/v2.21}"
 
 TMP_REPO_DIR="${TMP_REPO_DIR:-/tmp/kubermatic-sources}"
 TMP_DASHBOARD_DIR="${TMP_DASHBOARD_DIR:-/tmp/kkp-dashboards}"