diff --git a/codecov.yml b/codecov.yml
index fab28aee..4494dcd4 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -15,4 +15,3 @@ coverage:
       default:
         target: 85%
         threshold: 2.5%
-
diff --git a/demo-notebooks/guided-demos/4_rayjob_existing_cluster.ipynb b/demo-notebooks/guided-demos/4_rayjob_existing_cluster.ipynb
index 5348099c..70412f7b 100644
--- a/demo-notebooks/guided-demos/4_rayjob_existing_cluster.ipynb
+++ b/demo-notebooks/guided-demos/4_rayjob_existing_cluster.ipynb
@@ -37,7 +37,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from codeflare_sdk import Cluster, ClusterConfiguration, RayJob, TokenAuthentication"
+    "from codeflare_sdk import Cluster, ClusterConfiguration, RayJob"
    ]
   },
   {
@@ -45,7 +45,7 @@
    "id": "649c5911",
    "metadata": {},
    "source": [
-    "Execute the below cell to authenticate the notebook via OpenShift."
+    "Run the below `oc login` command using your Token and Server URL. Ensure the command is prepended by `!` and not `%`. This will work when running both locally and within RHOAI."
    ]
   },
   {
@@ -55,12 +55,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "auth = TokenAuthentication(\n",
-    "    token = \"XXXXX\",\n",
-    "    server = \"XXXXX\",\n",
-    "    skip_tls=False\n",
-    ")\n",
-    "auth.login()"
+    "!oc login --token=<your-token> --server=<your-server-url>"
    ]
   },
   {
@@ -116,7 +111,7 @@
    "id": "a0e2a650",
    "metadata": {},
    "source": [
-    "## Creating and Submitting the RayJob"
+    "## Submitting the RayJob"
    ]
   },
   {
diff --git a/demo-notebooks/guided-demos/5_rayjob_lifecycled_cluster.ipynb b/demo-notebooks/guided-demos/5_submit_rayjob_cr.ipynb
similarity index 80%
rename from demo-notebooks/guided-demos/5_rayjob_lifecycled_cluster.ipynb
rename to demo-notebooks/guided-demos/5_submit_rayjob_cr.ipynb
index 7f4fdc57..1d9630b7 100644
--- a/demo-notebooks/guided-demos/5_rayjob_lifecycled_cluster.ipynb
+++ b/demo-notebooks/guided-demos/5_submit_rayjob_cr.ipynb
@@ -5,7 +5,7 @@
    "id": "9259e514",
    "metadata": {},
    "source": [
-    "# Submitting a RayJob which lifecycles its own RayCluster\n",
+    "# Submitting a RayJob CR\n",
     "\n",
     "In this notebook, we will go through the basics of using the SDK to:\n",
     " * Define a RayCluster configuration\n",
@@ -18,14 +18,7 @@
    "id": "18136ea7",
    "metadata": {},
    "source": [
-    "## Defining and Submitting the RayJob"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "a1c2545d",
-   "metadata": {},
-   "source": [
+    "## Defining and Submitting the RayJob\n",
     "First, we'll need to import the relevant CodeFlare SDK packages. You can do this by executing the below cell."
    ]
   },
@@ -36,7 +29,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from codeflare_sdk import RayJob, ManagedClusterConfig, TokenAuthentication"
+    "from codeflare_sdk import RayJob, ManagedClusterConfig"
    ]
   },
   {
@@ -44,9 +37,7 @@
    "id": "649c5911",
    "metadata": {},
    "source": [
-    "Execute the below cell to authenticate the notebook via OpenShift.\n",
-    "\n",
-    "**TODO: Add guide to authenticate locally.**"
+    "Run the below `oc login` command using your Token and Server URL. Ensure the command is prepended by `!` and not `%`. This will work when running both locally and within RHOAI."
    ]
   },
   {
@@ -56,12 +47,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "auth = TokenAuthentication(\n",
-    "    token = \"XXXXX\",\n",
-    "    server = \"XXXXX\",\n",
-    "    skip_tls=False\n",
-    ")\n",
-    "auth.login()"
+    "!oc login --token=<your-token> --server=<your-server-url>"
    ]
   },
   {
@@ -120,7 +106,7 @@
    "id": "f3612de2",
    "metadata": {},
    "source": [
-    "We can check the status of our cluster by executing the below cell. If it's not up immediately, run the cell a few more times until you see that it's in a 'running' state."
+    "We can check the status of our job by executing the below cell. The status may appear as `unknown` for a time while the RayCluster spins up."
    ]
   },
   {