diff --git a/docs/templates/api/connection.md b/docs/templates/api/connection.md
deleted file mode 100644
index 19e13f3eb..000000000
--- a/docs/templates/api/connection.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Connection
-
-{{connection}}
-
-## Properties
-
-{{connection_properties}}
-
-## Methods
-
-{{connection_methods}}
diff --git a/mkdocs.yml b/mkdocs.yml
index fb4ba442f..cb99b7825 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -18,7 +18,6 @@ nav:
   - API<div class="dropdown"><button class="dropbtn"> API </button> <div id="myDropdown" class="dropdown-content"> <a id="hopsworks_api_link" href="https://docs.hopsworks.ai/hopsworks-api/latest">Hopsworks API</a> <a id="hsfs_javadoc_link" href="https://docs.hopsworks.ai/hopsworks-api/latest/javadoc">Feature Store JavaDoc</a> </div></div>:
     - Login: generated/api/login.md
     - Platform API:
-      - Connection: generated/api/connection.md
       - Datasets: generated/api/datasets.md
       - Environment: generated/api/environment.md
       - Executions: generated/api/executions.md
diff --git a/python/auto_doc.py b/python/auto_doc.py
index 434136c5f..97c5fa2ce 100644
--- a/python/auto_doc.py
+++ b/python/auto_doc.py
@@ -40,15 +40,6 @@
     "api/udf.md": {
         "udf": ["hopsworks.udf"],
     },
-    "api/connection.md": {
-        "connection": ["hopsworks.connection.Connection.connection"],
-        "connection_properties": keras_autodoc.get_properties(
-            "hopsworks.connection.Connection"
-        ),
-        "connection_methods": keras_autodoc.get_methods(
-            "hopsworks.connection.Connection", exclude=EXCLUDE_METHODS
-        ),
-    },
     "api/projects.md": {
         "project_create": ["hopsworks.create_project"],
         "project_properties": keras_autodoc.get_properties("hopsworks.project.Project"),
@@ -278,7 +269,7 @@
     },
     "api/feature_store_api.md": {
         "fs": ["hsfs.feature_store.FeatureStore"],
-        "fs_get": ["hsfs.connection.Connection.get_feature_store"],
+        "fs_get": ["hopsworks.project.Project.get_feature_store"],
         "fs_properties": keras_autodoc.get_properties(
             "hsfs.feature_store.FeatureStore"
         ),
@@ -549,7 +540,7 @@
     },
     # Model registry
     "model-registry/model_registry_api.md": {
-        "mr_get": ["hsml.connection.Connection.get_model_registry"],
+        "mr_get": ["hopsworks.project.Project.get_model_registry"],
         "mr_modules": keras_autodoc.get_properties(
             "hsml.model_registry.ModelRegistry",
             exclude=[
@@ -602,7 +593,7 @@
     },
     # Model Serving
     "model-serving/model_serving_api.md": {
-        "ms_get": ["hsml.connection.Connection.get_model_serving"],
+        "ms_get": ["hopsworks.project.Project.get_model_serving"],
         "ms_properties": keras_autodoc.get_properties(
             "hsml.model_serving.ModelServing"
         ),
@@ -611,7 +602,7 @@
         ),
     },
     "model-serving/deployment_api.md": {
-        "ms_get_model_serving": ["hsml.connection.Connection.get_model_serving"],
+        "ms_get_model_serving": ["hopsworks.project.Project.get_model_serving"],
         "ms_get_deployments": [
             "hsml.model_serving.ModelServing.get_deployment",
             "hsml.model_serving.ModelServing.get_deployment_by_id",
@@ -626,7 +617,7 @@
         ),
     },
     "model-serving/predictor_api.md": {
-        "ms_get_model_serving": ["hsml.connection.Connection.get_model_serving"],
+        "ms_get_model_serving": ["hopsworks.project.Project.get_model_serving"],
         "ms_create_predictor": ["hsml.model_serving.ModelServing.create_predictor"],
         "pred_properties": keras_autodoc.get_properties("hsml.predictor.Predictor"),
         "pred_methods": keras_autodoc.get_methods(
@@ -635,7 +626,7 @@
         ),
     },
     "model-serving/transformer_api.md": {
-        "ms_get_model_serving": ["hsml.connection.Connection.get_model_serving"],
+        "ms_get_model_serving": ["hopsworks.project.Project.get_model_serving"],
         "ms_create_transformer": ["hsml.model_serving.ModelServing.create_transformer"],
         "trans_properties": keras_autodoc.get_properties(
             "hsml.transformer.Transformer"