diff --git a/build/cluster.tf b/build/cluster.tf
index 50b09e4a07..dc8ed717a0 100644
--- a/build/cluster.tf
+++ b/build/cluster.tf
@@ -126,10 +126,10 @@ resource "google_container_cluster" "primary" {
           "https://www.googleapis.com/auth/trace.append",
         ]
         labels = {
-          "stable.agones.dev/agones-system" = "true"
+          "agones.dev/agones-system" = "true"
         }
         taint = {
-            key = "stable.agones.dev/agones-system"
+            key = "agones.dev/agones-system"
             value = "true"
             effect = "NO_EXECUTE"
         }
@@ -152,10 +152,10 @@ resource "google_container_cluster" "primary" {
           "https://www.googleapis.com/auth/trace.append",
         ]
         labels = {
-          "stable.agones.dev/agones-metrics" = "true"
+          "agones.dev/agones-metrics" = "true"
         }
         taint = {
-            key = "stable.agones.dev/agones-metrics"
+            key = "agones.dev/agones-metrics"
             value = "true"
             effect = "NO_EXECUTE"
         }
diff --git a/build/gke-test-cluster/cluster.yml.jinja b/build/gke-test-cluster/cluster.yml.jinja
index 401a75ca5d..4722685bf9 100644
--- a/build/gke-test-cluster/cluster.yml.jinja
+++ b/build/gke-test-cluster/cluster.yml.jinja
@@ -48,9 +48,9 @@ resources:
               - https://www.googleapis.com/auth/servicecontrol
               - https://www.googleapis.com/auth/trace.append
             labels:
-              stable.agones.dev/agones-system: "true"
+              agones.dev/agones-system: "true"
             taints:
-              - key: "stable.agones.dev/agones-system"
+              - key: "agones.dev/agones-system"
                 value: "true"
                 effect: "NO_EXECUTE"
         - name: "agones-metrics"
@@ -65,9 +65,9 @@ resources:
               - https://www.googleapis.com/auth/servicecontrol
               - https://www.googleapis.com/auth/trace.append
             labels:
-              stable.agones.dev/agones-metrics: "true"
+              agones.dev/agones-metrics: "true"
             taints:
-              - key: "stable.agones.dev/agones-metrics"
+              - key: "agones.dev/agones-metrics"
                 value: "true"
                 effect: "NO_EXECUTE"
 - name: game-server-firewall
diff --git a/build/grafana.yaml b/build/grafana.yaml
index 9a1557972e..e9a3a11b37 100644
--- a/build/grafana.yaml
+++ b/build/grafana.yaml
@@ -1,7 +1,7 @@
 service:
   port: 3000
 tolerations:
-- key: "stable.agones.dev/agones-metrics"
+- key: "agones.dev/agones-metrics"
   operator: "Equal"
   value: "true"
   effect: "NoExecute"
@@ -11,7 +11,7 @@ affinity:
     - weight: 1
       preference:
         matchExpressions:
-          - key: stable.agones.dev/agones-metrics
+          - key: agones.dev/agones-metrics
             operator: Exists
 sidecar:
     dashboards:
diff --git a/build/grafana/dashboard-status.yaml b/build/grafana/dashboard-status.yaml
index 570d821c4d..6c5e56b7d1 100644
--- a/build/grafana/dashboard-status.yaml
+++ b/build/grafana/dashboard-status.yaml
@@ -108,7 +108,7 @@ data:
           "targets": [
             {
               "$$hashKey": "object:818",
-              "expr": "(process_start_time_seconds{app=\"agones\",stable_agones_dev_role=\"controller\"}) * 1000",
+              "expr": "(process_start_time_seconds{app=\"agones\",agones_dev_role=\"controller\"}) * 1000",
               "format": "time_series",
               "instant": true,
               "intervalFactor": 1,
diff --git a/build/modules/gke/cluster.tf b/build/modules/gke/cluster.tf
index f63db41d17..68ce2b88a2 100644
--- a/build/modules/gke/cluster.tf
+++ b/build/modules/gke/cluster.tf
@@ -115,10 +115,10 @@ resource "google_container_node_pool" "agones-system" {
       "https://www.googleapis.com/auth/trace.append",
     ]
     labels = {
-      "stable.agones.dev/agones-system" = "true"
+      "agones.dev/agones-system" = "true"
     }
     taint = {
-        key = "stable.agones.dev/agones-system"
+        key = "agones.dev/agones-system"
         value = "true"
         effect = "NO_EXECUTE"
     }
@@ -145,10 +145,10 @@ resource "google_container_node_pool" "agones-metrics" {
       "https://www.googleapis.com/auth/trace.append",
     ]
     labels = {
-      "stable.agones.dev/agones-metrics" = "true"
+      "agones.dev/agones-metrics" = "true"
     }
     taint = {
-        key = "stable.agones.dev/agones-metrics"
+        key = "agones.dev/agones-metrics"
         value = "true"
         effect = "NO_EXECUTE"
     }
diff --git a/build/prometheus.yaml b/build/prometheus.yaml
index 221b42e655..8165fd5041 100644
--- a/build/prometheus.yaml
+++ b/build/prometheus.yaml
@@ -12,7 +12,7 @@ server:
       memory: 4Gi
       cpu: 2
   tolerations:
-  - key: "stable.agones.dev/agones-metrics"
+  - key: "agones.dev/agones-metrics"
     operator: "Equal"
     value: "true"
     effect: "NoExecute"
@@ -22,7 +22,7 @@ server:
       - weight: 1
         preference:
           matchExpressions:
-            - key: stable.agones.dev/agones-metrics
+            - key: agones.dev/agones-metrics
               operator: Exists
 serverFiles:
  prometheus.yml: