diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
index 544c52139..436abe05c 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:
-            workload.codeflare.dev/appwrapper: gptfttest
+            appwrapper.mcad.ibm.com: 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 e10bc3bfb..5f952649a 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:
-            workload.codeflare.dev/appwrapper: instascaletest
+            appwrapper.mcad.ibm.com: 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 dd5eba28f..c80684e12 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:
-            workload.codeflare.dev/appwrapper: interactivetest
+            appwrapper.mcad.ibm.com: 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 b2e7a0aa0..aa85803e7 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:
-            workload.codeflare.dev/appwrapper: jobtest
+            appwrapper.mcad.ibm.com: 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 0cbbdb7c3..c58b963a1 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:
-            workload.codeflare.dev/appwrapper: raytest
+            appwrapper.mcad.ibm.com: raytest
             controller-tools.k8s.io: '1.0'
           name: raytest
           namespace: default
diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
index 6d905566d..b48e7cf5a 100644
--- a/tests/test-case-no-mcad.yamls
+++ b/tests/test-case-no-mcad.yamls
@@ -3,8 +3,8 @@ apiVersion: ray.io/v1alpha1
 kind: RayCluster
 metadata:
   labels:
-    appwrapper.mcad.ibm.com: unit-test-cluster-ray
     controller-tools.k8s.io: '1.0'
+    workload.codeflare.dev/appwrapper: unit-test-cluster-ray
   name: unit-test-cluster-ray
   namespace: ns
 spec: