diff --git a/grafana/create-nodepool.sh b/grafana/create-nodepool.sh
index 0114eb25ad..980c4adefb 100755
--- a/grafana/create-nodepool.sh
+++ b/grafana/create-nodepool.sh
@@ -43,7 +43,7 @@ function create_zuul {
 # zuul-launcher-ram-icr.template : instances, cores, ram
 
 create_zuul zuul-launcher-ir.template Rackspace 'rax' zuul-launcher-rax.json
-create_zuul zuul-launcher-ir.template Rackspace-Flex 'raxflex' zuul-launcher-raxflex.json
+create_zuul zuul-launcher-icr.template Rackspace-Flex 'raxflex' zuul-launcher-raxflex.json
 create_zuul zuul-launcher-icr.template OVH 'ovh' zuul-launcher-ovh.json
 create_zuul zuul-launcher-icr.template Vexxhost 'vexxhost' zuul-launcher-vexxhost.json
 create_zuul zuul-launcher-icr.template OSUOSL 'osuosl' zuul-launcher-osuosl.json
diff --git a/grafana/zuul-launcher-raxflex.json b/grafana/zuul-launcher-raxflex.json
index 3a7e990ca5..8d7a1c9a78 100644
--- a/grafana/zuul-launcher-raxflex.json
+++ b/grafana/zuul-launcher-raxflex.json
@@ -52,7 +52,7 @@
           "showLineNumbers": false,
           "showMiniMap": false
         },
-        "content": "Rackspace-Flex Zuul-Launcher Status\n========================\n\nThis dashboard monitors the status of Zuul Launcher in Rackspace-Flex.\n\n**This dashboard is managed by [Grafyaml](https://docs.openstack.org/infra/system-config/grafyaml.html).**\nIf you would like to make changes to this dashboard, please see the template in the `grafana` directory in\n[project-config](https://opendev.org/openstack/project-config/src/branch/master/grafana/zuul-launcher-ir.template).\n",
+        "content": "Rackspace-Flex Zuul-Launcher Status\n========================\n\nThis dashboard monitors the status of Zuul Launcher in Rackspace-Flex.\n\n**This dashboard is managed by [Grafyaml](https://docs.openstack.org/infra/system-config/grafyaml.html).**\nIf you would like to make changes to this dashboard, please see the template in the `grafana` directory in\n[project-config](https://opendev.org/openstack/project-config/src/branch/master/grafana/zuul-launcher-icr.template).\n",
         "mode": "markdown"
       },
       "pluginVersion": "12.0.2",
@@ -440,6 +440,26 @@
           "refId": "B",
           "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')"
         },
+        {
+          "datasource": {
+            "type": "graphite",
+            "uid": "d9c17c45a8"
+          },
+          "hide": false,
+          "refCount": 0,
+          "refId": "C",
+          "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.cores, 'Cores')"
+        },
+        {
+          "datasource": {
+            "type": "graphite",
+            "uid": "d9c17c45a8"
+          },
+          "hide": false,
+          "refCount": 0,
+          "refId": "D",
+          "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.cores, 'core limit')"
+        },
         {
           "datasource": {
             "type": "graphite",
@@ -479,6 +499,22 @@
             ]
           }
         },
+        {
+          "id": "configFromData",
+          "options": {
+            "applyTo": {
+              "id": "byName",
+              "options": "Cores"
+            },
+            "configRefId": "D",
+            "mappings": [
+              {
+                "fieldName": "core limit",
+                "handlerKey": "max"
+              }
+            ]
+          }
+        },
         {
           "id": "configFromData",
           "options": {