diff --git a/codeflare-stack/README.md b/codeflare-stack/README.md
index ef75d5fc4..490597084 100644
--- a/codeflare-stack/README.md
+++ b/codeflare-stack/README.md
@@ -17,14 +17,14 @@ Integration of this stack into the Open Data Hub is owned by the Distributed Wor
 Group. See [this page](https://github.com/opendatahub-io/opendatahub-community/tree/master/wg-distributed-workloads)
 for further details and how to get in touch.
 
-### Compatibilty Matrix
+### Compatibility Matrix
 
 | Component                    | Version |
 |------------------------------|---------|
-| CodeFlare Operator           | v0.0.4  |
-| Multi-Cluster App Dispatcher | v1.31.0 |
-| CodeFlare-SDK                | v0.4.4  |
-| InstaScale                   | v0.0.4  |
+| CodeFlare Operator           | v0.1.0  |
+| Multi-Cluster App Dispatcher | v1.33.0 |
+| CodeFlare-SDK                | v0.6.1  |
+| InstaScale                   | v0.0.6  |
 | KubeRay                      | v0.5.0  |
 
 ## Quick Start
diff --git a/codeflare-stack/base/codeflare-notebook-imagestream.yaml b/codeflare-stack/base/codeflare-notebook-imagestream.yaml
index f3f93ea54..fc94ab241 100644
--- a/codeflare-stack/base/codeflare-notebook-imagestream.yaml
+++ b/codeflare-stack/base/codeflare-notebook-imagestream.yaml
@@ -16,6 +16,6 @@ spec:
       name: latest
       from:
         kind: DockerImage
-        name: quay.io/project-codeflare/notebook:latest
+        name: quay.io/project-codeflare/notebook:v0.6.1
       importPolicy:
             scheduled: true
diff --git a/ray/operator/base/kustomization.yaml b/ray/operator/base/kustomization.yaml
index e30220269..3ed9ebe02 100644
--- a/ray/operator/base/kustomization.yaml
+++ b/ray/operator/base/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 configMapGenerator:
-- name: codeflare-stack-config
+- name: ray-config
   envs:
     - params.env
 configurations:
@@ -12,10 +12,17 @@ vars:
 - name: namespace
   objref:
     kind: ConfigMap
-    name: codeflare-stack-config
+    name: ray-config
     apiVersion: v1
   fieldref:
     fieldpath: data.namespace
+- name: odh-kuberay-operator-controller-image
+  objref:
+    kind: ConfigMap
+    name: ray-config
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-kuberay-operator-controller-image
 
 resources:
 - ../crd
@@ -23,9 +30,3 @@ resources:
 - ../manager
 - ../prometheus
 - ../scc
-
-images:
-- name: kuberay/operator
-  newName: quay.io/opendatahub/kuberay-operator
-  newTag: v0.5.0
-
diff --git a/ray/operator/base/params.env b/ray/operator/base/params.env
index d22ef5e7d..a2bcc6009 100644
--- a/ray/operator/base/params.env
+++ b/ray/operator/base/params.env
@@ -1 +1,2 @@
 namespace=opendatahub
+odh-kuberay-operator-controller-image=quay.io/opendatahub/kuberay-operator:v0.5.0
diff --git a/ray/operator/base/params.yaml b/ray/operator/base/params.yaml
index 86b1c98af..8b80136d2 100644
--- a/ray/operator/base/params.yaml
+++ b/ray/operator/base/params.yaml
@@ -2,4 +2,6 @@ varReference:
   - path: subjects[]/namespace
     kind: ClusterRoleBinding
   - path: users[]
-    kind: SecurityContextConstraints
\ No newline at end of file
+    kind: SecurityContextConstraints
+  - path: spec/template/spec/containers[]/image
+    kind: Deployment
diff --git a/ray/operator/manager/manager.yaml b/ray/operator/manager/manager.yaml
index 1579541cd..0d13a74b8 100644
--- a/ray/operator/manager/manager.yaml
+++ b/ray/operator/manager/manager.yaml
@@ -25,9 +25,7 @@ spec:
       containers:
       - command:
         - /manager
-#        args:
-#        - --enable-leader-election
-        image: kuberay/operator
+        image: $(odh-kuberay-operator-controller-image)
         ports:
         - name: http
           containerPort: 8080
diff --git a/tests/basictests/ray.sh b/tests/basictests/ray.sh
index acebc7182..18e2b6101 100755
--- a/tests/basictests/ray.sh
+++ b/tests/basictests/ray.sh
@@ -26,7 +26,8 @@ function start_test_ray_cluster(){
     os::cmd::expect_success "oc project ${ODHPROJECT}"
     os::cmd::expect_success "oc apply -f ${RESOURCEDIR}/ray/ray-test-cluster-test.yaml"
     os::cmd::try_until_text "oc get RayCluster kuberay-cluster-test" "kuberay-cluster-test" $odhdefaulttimeout $odhdefaultinterval
-    sleep 15
+    os::cmd::try_until_text "oc get pods -l ray.io/identifier=kuberay-cluster-test-head -o jsonpath='{$.items[*].status.phase}'" "Running" $odhdefaulttimeout $odhdefaultinterval
+    os::cmd::try_until_text "oc get pods -l ray.io/identifier=kuberay-cluster-test-worker -o jsonpath='{$.items[*].status.phase}'" "Running" $odhdefaulttimeout $odhdefaultinterval
 }
 
 function check_functionality(){
diff --git a/tests/resources/codeflare-stack/codeflare-subscription.yaml b/tests/resources/codeflare-stack/codeflare-subscription.yaml
index 43cb217e7..f61fe7a5d 100644
--- a/tests/resources/codeflare-stack/codeflare-subscription.yaml
+++ b/tests/resources/codeflare-stack/codeflare-subscription.yaml
@@ -9,4 +9,4 @@ spec:
   source: community-operators
   sourceNamespace: openshift-marketplace
   installPlanApproval: Manual
-  startingCSV: codeflare-operator.v0.0.4
+  startingCSV: codeflare-operator.v0.1.0
diff --git a/tests/resources/codeflare-stack/mnist_ray_mini.ipynb b/tests/resources/codeflare-stack/mnist_ray_mini.ipynb
index dfa6f3df0..8752a32fb 100644
--- a/tests/resources/codeflare-stack/mnist_ray_mini.ipynb
+++ b/tests/resources/codeflare-stack/mnist_ray_mini.ipynb
@@ -25,7 +25,7 @@
    "outputs": [],
    "source": [
     "# Create our cluster and submit appwrapper\n",
-    "cluster = Cluster(ClusterConfiguration(namespace='opendatahub', name='mnisttest', min_worker=2, max_worker=2, min_cpus=2, max_cpus=2, min_memory=4, max_memory=4, gpu=0, instascale=False))"
+    "cluster = Cluster(ClusterConfiguration(namespace='opendatahub', name='mnisttest', num_workers=2, min_cpus=2, max_cpus=2, min_memory=4, max_memory=4, num_gpus=0, instascale=False))"
    ]
   },
   {
@@ -50,7 +50,8 @@
    },
    "outputs": [],
    "source": [
-    "cluster.wait_ready()"
+    "cluster.wait_ready()\n",
+    "sleep(30)"
    ]
   },
   {