diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5b6ce771..63f17237 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,3 +4,4 @@
 
 # Default owner for everything, unless overridden by a more specific rule.
 * @Azure-Samples/azure-ai-samples-maintainers
+/scenarios/resource-creation/basic/AIStudioHubAndProject.ipynb @sdgilley @msakande @Blackmist @ssalgadodev @lgayhardt @fbsolo-ms1
\ No newline at end of file
diff --git a/scenarios/resource-creation/basic/AIStudioHubAndProject.ipynb b/scenarios/resource-creation/basic/AIStudioHubAndProject.ipynb
index 4f8d5bbd..9fbb57c9 100644
--- a/scenarios/resource-creation/basic/AIStudioHubAndProject.ipynb
+++ b/scenarios/resource-creation/basic/AIStudioHubAndProject.ipynb
@@ -35,7 +35,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "84916e91",
-   "metadata": {},
+   "metadata": {
+    "name": "subscription"
+   },
    "outputs": [],
    "source": [
     "from azure.identity import DefaultAzureCredential\n",
@@ -51,7 +53,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "102bc0f4-3883-4f15-8add-552b165f3aeb",
-   "metadata": {},
+   "metadata": {
+    "name": "mlclient"
+   },
    "outputs": [],
    "source": [
     "# Create a resource group\n",
@@ -82,7 +86,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "df454cfa-d8e4-45a3-918e-241397f613c5",
-   "metadata": {},
+   "metadata": {
+    "name": "resource-names"
+   },
    "outputs": [],
    "source": [
     "## Hub\n",
@@ -131,7 +137,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "c770d5b6-aa51-43fa-90c9-7198acd4047d",
-   "metadata": {},
+   "metadata": {
+    "name": "create-hub"
+   },
    "outputs": [],
    "source": [
     "from azure.ai.ml.entities import Hub\n",
@@ -156,7 +164,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "5fc32ab7-08ce-4d05-a820-9401d47f583a",
-   "metadata": {},
+   "metadata": {
+    "name": "create-project"
+   },
    "outputs": [],
    "source": [
     "from azure.ai.ml.entities import Project\n",
@@ -181,7 +191,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "73972152",
-   "metadata": {},
+   "metadata": {
+    "name": "create-aiservices"
+   },
    "outputs": [],
    "source": [
     "# Create AI Services resource, this may take a few minutes\n",
@@ -215,7 +227,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "9513ab57",
-   "metadata": {},
+   "metadata": {
+    "name": "create-connection"
+   },
    "outputs": [],
    "source": [
     "aiservices_key = aiservices_client.accounts.list_keys(\n",
@@ -257,7 +271,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "e29d32c5-89ad-41c7-91ca-6aa16f707d4d",
-   "metadata": {},
+   "metadata": {
+    "name": "create-deployment"
+   },
    "outputs": [],
    "source": [
     "from azure.mgmt.cognitiveservices import CognitiveServicesManagementClient\n",
@@ -312,7 +328,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "6c4219d3",
-   "metadata": {},
+   "metadata": {
+    "name": "create-aisearch"
+   },
    "outputs": [],
    "source": [
     "from azure.mgmt import search as Se\n",
@@ -366,7 +384,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "d5cd467b-51e7-4bbe-a236-cbe5c646087a",
-   "metadata": {},
+   "metadata": {
+    "name": "update-client"
+   },
    "outputs": [],
    "source": [
     "ml_client = MLClient(\n",