diff --git a/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-hierarchical-timeseries/hts_evaluation_pipeline.yml b/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-hierarchical-timeseries/hts_evaluation_pipeline.yml
index b3547cf2af..30d5a5c25e 100644
--- a/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-hierarchical-timeseries/hts_evaluation_pipeline.yml
+++ b/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-hierarchical-timeseries/hts_evaluation_pipeline.yml
@@ -38,7 +38,7 @@ outputs:
 jobs:
   automl_hts_training:
     type: command
-    component: azureml://registries/azureml-preview/components/automl_hts_training
+    component: azureml://registries/azureml/components/automl_hts_training
     inputs:
       raw_data: ${{parent.inputs.raw_data}}
       automl_config: ${{parent.inputs.automl_config}}
@@ -52,7 +52,7 @@ jobs:
         
   automl_hts_inference:
     type: command
-    component: azureml://registries/azureml-preview/components/automl_hts_inference
+    component: azureml://registries/azureml/components/automl_hts_inference
     inputs:
       raw_data: ${{parent.inputs.inference_data}}
       forecast_level: ${{parent.inputs.forecast_level}}
diff --git a/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-many-models/many_models_evaluation_pipeline.yml b/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-many-models/many_models_evaluation_pipeline.yml
index eda665bd39..97d997a440 100644
--- a/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-many-models/many_models_evaluation_pipeline.yml
+++ b/cli/jobs/pipelines/automl/cli-automl-forecasting-demand-with-pipeline-components/cli-automl-forecasting-demand-many-models/many_models_evaluation_pipeline.yml
@@ -38,7 +38,7 @@ outputs:
 jobs:
   automl_mm_training:
     type: command
-    component: azureml://registries/azureml-preview/components/automl_many_models_training
+    component: azureml://registries/azureml/components/automl_many_models_training
     inputs:
       raw_data: ${{parent.inputs.raw_data}}
       automl_config: ${{parent.inputs.automl_config}}
@@ -53,7 +53,7 @@ jobs:
 
   automl_mm_inference:
     type: command
-    component: azureml://registries/azureml-preview/components/automl_many_models_inference
+    component: azureml://registries/azureml/components/automl_many_models_inference
     inputs:
       raw_data: ${{parent.inputs.inference_data}}
       max_concurrency_per_node: ${{parent.inputs.max_concurrency_per_node}}
diff --git a/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-hierarchical-timeseries-in-pipeline/automl-forecasting-demand-hierarchical-timeseries-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-hierarchical-timeseries-in-pipeline/automl-forecasting-demand-hierarchical-timeseries-in-pipeline.ipynb
index 7f95967758..9c0c078043 100644
--- a/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-hierarchical-timeseries-in-pipeline/automl-forecasting-demand-hierarchical-timeseries-in-pipeline.ipynb
+++ b/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-hierarchical-timeseries-in-pipeline/automl-forecasting-demand-hierarchical-timeseries-in-pipeline.ipynb
@@ -335,24 +335,12 @@
    },
    "outputs": [],
    "source": [
-    "# get registry for all components with the exception of compute metrics component\n",
-    "ml_client_registry = MLClient(credential=credential, registry_name=\"azureml-preview\")\n",
+    "# get registry for all components\n",
+    "ml_client_registry = MLClient(credential=credential, registry_name=\"azureml\")\n",
     "print(ml_client_registry)\n",
     "print(\"---\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# get registry for the compute metrics component\n",
-    "ml_client_metrics_registry = MLClient(credential=credential, registry_name=\"azureml\")\n",
-    "print(ml_client_metrics_registry)\n",
-    "print(\"---\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -434,7 +422,7 @@
    },
    "outputs": [],
    "source": [
-    "compute_metrics_component = ml_client_metrics_registry.components.get(\n",
+    "compute_metrics_component = ml_client_registry.components.get(\n",
     "    name=\"compute_metrics\", label=\"latest\"\n",
     ")\n",
     "print(f\"Compute metrics component version: {compute_metrics_component.version}\\n---\")"
diff --git a/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-many-models-in-pipeline/automl-forecasting-demand-many-models-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-many-models-in-pipeline/automl-forecasting-demand-many-models-in-pipeline.ipynb
index 0ac29e42ac..93959dd454 100644
--- a/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-many-models-in-pipeline/automl-forecasting-demand-many-models-in-pipeline.ipynb
+++ b/sdk/python/jobs/pipelines/1k_demand_forecasting_with_pipeline_components/automl-forecasting-demand-many-models-in-pipeline/automl-forecasting-demand-many-models-in-pipeline.ipynb
@@ -324,24 +324,12 @@
    },
    "outputs": [],
    "source": [
-    "# get registry for all components with the exception of compute metrics component\n",
-    "ml_client_registry = MLClient(credential=credential, registry_name=\"azureml-preview\")\n",
+    "# get registry for all components\n",
+    "ml_client_registry = MLClient(credential=credential, registry_name=\"azureml\")\n",
     "print(ml_client_registry)\n",
     "print(\"---\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# get registry for the compute metrics component\n",
-    "ml_client_metrics_registry = MLClient(credential=credential, registry_name=\"azureml\")\n",
-    "print(ml_client_metrics_registry)\n",
-    "print(\"---\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -443,7 +431,7 @@
    },
    "outputs": [],
    "source": [
-    "compute_metrics_component = ml_client_metrics_registry.components.get(\n",
+    "compute_metrics_component = ml_client_registry.components.get(\n",
     "    name=\"compute_metrics\", label=\"latest\"\n",
     ")\n",
     "print(\n",