diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
index 436abe05c..544c52139 100644
--- a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
+++ b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: gptfttest
+            workload.codeflare.dev/appwrapper: gptfttest
             controller-tools.k8s.io: '1.0'
           name: gptfttest
           namespace: default
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
index 5f952649a..e10bc3bfb 100644
--- a/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
+++ b/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: instascaletest
+            workload.codeflare.dev/appwrapper: instascaletest
             controller-tools.k8s.io: '1.0'
           name: instascaletest
           namespace: default
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
index c80684e12..dd5eba28f 100644
--- a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
+++ b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: interactivetest
+            workload.codeflare.dev/appwrapper: interactivetest
             controller-tools.k8s.io: '1.0'
           name: interactivetest
           namespace: default
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
index aa85803e7..b2e7a0aa0 100644
--- a/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
+++ b/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
@@ -31,7 +31,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: jobtest
+            workload.codeflare.dev/appwrapper: jobtest
             controller-tools.k8s.io: '1.0'
           name: jobtest
           namespace: default
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
index c58b963a1..0cbbdb7c3 100644
--- a/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
+++ b/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
@@ -31,7 +31,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: raytest
+            workload.codeflare.dev/appwrapper: raytest
             controller-tools.k8s.io: '1.0'
           name: raytest
           namespace: default
diff --git a/docs/utils/generate_yaml.html b/docs/utils/generate_yaml.html
index 791898a3b..eb002a560 100644
--- a/docs/utils/generate_yaml.html
+++ b/docs/utils/generate_yaml.html
@@ -99,7 +99,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
     metadata[&#34;name&#34;] = appwrapper_name
     metadata[&#34;namespace&#34;] = namespace
     lower_meta = item.get(&#34;generictemplate&#34;, {}).get(&#34;metadata&#34;)
-    lower_meta[&#34;labels&#34;][&#34;appwrapper.mcad.ibm.com&#34;] = appwrapper_name
+    lower_meta[&#34;labels&#34;][&#34;workload.codeflare.dev/appwrapper&#34;] = appwrapper_name
     lower_meta[&#34;name&#34;] = cluster_name
     lower_meta[&#34;namespace&#34;] = namespace
 
@@ -917,7 +917,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
     metadata[&#34;name&#34;] = appwrapper_name
     metadata[&#34;namespace&#34;] = namespace
     lower_meta = item.get(&#34;generictemplate&#34;, {}).get(&#34;metadata&#34;)
-    lower_meta[&#34;labels&#34;][&#34;appwrapper.mcad.ibm.com&#34;] = appwrapper_name
+    lower_meta[&#34;labels&#34;][&#34;workload.codeflare.dev/appwrapper&#34;] = appwrapper_name
     lower_meta[&#34;name&#34;] = cluster_name
     lower_meta[&#34;namespace&#34;] = namespace</code></pre>
 </details>
diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
index d2f3385ee..cf4ec4966 100644
--- a/src/codeflare_sdk/templates/base-template.yaml
+++ b/src/codeflare_sdk/templates/base-template.yaml
@@ -41,7 +41,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: "aw-kuberay"
+            workload.codeflare.dev/appwrapper: "aw-kuberay"
             controller-tools.k8s.io: "1.0"
             # A unique identifier for the head node and workers of this cluster.
           name: kuberay-cluster
diff --git a/src/codeflare_sdk/utils/generate_yaml.py b/src/codeflare_sdk/utils/generate_yaml.py
index 95e1c5ecb..a9ccd0ba1 100755
--- a/src/codeflare_sdk/utils/generate_yaml.py
+++ b/src/codeflare_sdk/utils/generate_yaml.py
@@ -68,7 +68,7 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
     metadata["name"] = appwrapper_name
     metadata["namespace"] = namespace
     lower_meta = item.get("generictemplate", {}).get("metadata")
-    lower_meta["labels"]["appwrapper.mcad.ibm.com"] = appwrapper_name
+    lower_meta["labels"]["workload.codeflare.dev/appwrapper"] = appwrapper_name
     lower_meta["name"] = cluster_name
     lower_meta["namespace"] = namespace
 
diff --git a/tests/test-case-bad.yaml b/tests/test-case-bad.yaml
index cdc4f6ac1..eb800e565 100644
--- a/tests/test-case-bad.yaml
+++ b/tests/test-case-bad.yaml
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: unit-test-cluster
+            workload.codeflare.dev/appwrapper: unit-test-cluster
             controller-tools.k8s.io: '1.0'
           name: unit-test-cluster
           namespace: ns
diff --git a/tests/test-case-prio.yaml b/tests/test-case-prio.yaml
index 6e7c86872..36cc3a408 100644
--- a/tests/test-case-prio.yaml
+++ b/tests/test-case-prio.yaml
@@ -33,8 +33,8 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: prio-test-cluster
             controller-tools.k8s.io: '1.0'
+            workload.codeflare.dev/appwrapper: prio-test-cluster
           name: prio-test-cluster
           namespace: ns
         spec:
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
index 08d360557..8ab27f018 100644
--- a/tests/test-case.yaml
+++ b/tests/test-case.yaml
@@ -32,8 +32,8 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.mcad.ibm.com: unit-test-cluster
             controller-tools.k8s.io: '1.0'
+            workload.codeflare.dev/appwrapper: unit-test-cluster
           name: unit-test-cluster
           namespace: ns
         spec:
diff --git a/tests/unit_test.py b/tests/unit_test.py
index 9b78e9e2f..353bdf784 100644
--- a/tests/unit_test.py
+++ b/tests/unit_test.py
@@ -654,7 +654,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     "creationTimestamp": "2023-02-22T16:26:07Z",
                     "generation": 1,
                     "labels": {
-                        "appwrapper.mcad.ibm.com": "quicktest",
+                        "workload.codeflare.dev/appwrapper": "quicktest",
                         "controller-tools.k8s.io": "1.0",
                         "resourceName": "quicktest",
                         "orderedinstance": "m4.xlarge_g4dn.xlarge",
@@ -667,7 +667,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                                 "f:metadata": {
                                     "f:labels": {
                                         ".": {},
-                                        "f:appwrapper.mcad.ibm.com": {},
+                                        "f:workload.codeflare.dev/appwrapper": {},
                                         "f:controller-tools.k8s.io": {},
                                         "f:resourceName": {},
                                     },
@@ -1025,7 +1025,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
-                                            "appwrapper.mcad.ibm.com": "quicktest1",
+                                            "workload.codeflare.dev/appwrapper": "quicktest1",
                                             "controller-tools.k8s.io": "1.0",
                                         },
                                         "name": "quicktest1",
@@ -1348,7 +1348,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
-                                            "appwrapper.mcad.ibm.com": "quicktest2",
+                                            "workload.codeflare.dev/appwrapper": "quicktest2",
                                             "controller-tools.k8s.io": "1.0",
                                         },
                                         "name": "quicktest2",