diff --git a/docs/user_guides/mlops/serving/deployment-state.md b/docs/user_guides/mlops/serving/deployment-state.md
index 0ead89a22..814d25939 100644
--- a/docs/user_guides/mlops/serving/deployment-state.md
+++ b/docs/user_guides/mlops/serving/deployment-state.md
@@ -99,9 +99,9 @@ deployment.transformer.resources.describe()
 
 ### API Reference
 
-[Deployment](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/deployment/)
+[Deployment](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/deployment_api/)
 
-[PredictorState](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/predictor-state/)
+[PredictorState](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/predictor_api/)
 
 ## Deployment status
 
diff --git a/docs/user_guides/mlops/serving/deployment.md b/docs/user_guides/mlops/serving/deployment.md
index b6da0f77f..abc90d2f8 100644
--- a/docs/user_guides/mlops/serving/deployment.md
+++ b/docs/user_guides/mlops/serving/deployment.md
@@ -152,7 +152,7 @@ my_deployment.save()
 
 ### API Reference
 
-[Model Serving](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/deployment/)
+[Model Serving](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/deployment_api/)
 
 ## Model Artifact
 
diff --git a/docs/user_guides/mlops/serving/inference-batcher.md b/docs/user_guides/mlops/serving/inference-batcher.md
index d7ec29f38..25a55e7bc 100644
--- a/docs/user_guides/mlops/serving/inference-batcher.md
+++ b/docs/user_guides/mlops/serving/inference-batcher.md
@@ -94,7 +94,7 @@ my_deployment.save()
 
 ### API Reference
 
-[Inference Batcher](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/inference-batcher/)
+[Inference Batcher](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/inference_batcher_api/)
 
 ## Compatibility matrix
 
diff --git a/docs/user_guides/mlops/serving/inference-logger.md b/docs/user_guides/mlops/serving/inference-logger.md
index 8af482073..f0aeb738c 100644
--- a/docs/user_guides/mlops/serving/inference-logger.md
+++ b/docs/user_guides/mlops/serving/inference-logger.md
@@ -110,7 +110,7 @@ my_deployment.save()
 
 ### API Reference
 
-[Inference Logger](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/inference-logger/)
+[Inference Logger](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/inference_logger_api/)
 
 ## Topic schema
 
diff --git a/docs/user_guides/mlops/serving/predictor.md b/docs/user_guides/mlops/serving/predictor.md
index 661713b9d..12d79e937 100644
--- a/docs/user_guides/mlops/serving/predictor.md
+++ b/docs/user_guides/mlops/serving/predictor.md
@@ -165,7 +165,7 @@ my_deployment.save()
 
 ### API Reference
 
-[Predictor](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/predictor/)
+[Predictor](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/predictor_api/)
 
 ## Model Server
 
diff --git a/docs/user_guides/mlops/serving/resources.md b/docs/user_guides/mlops/serving/resources.md
index afa9f04a3..535f38f87 100644
--- a/docs/user_guides/mlops/serving/resources.md
+++ b/docs/user_guides/mlops/serving/resources.md
@@ -105,7 +105,7 @@ my_deployment.save()
 
 ### API Reference
 
-[Resource Allocation](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/resources/)
+[Resource Allocation](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/resources_api/)
 
 ## Compatibility matrix
 
diff --git a/docs/user_guides/mlops/serving/transformer.md b/docs/user_guides/mlops/serving/transformer.md
index 954d6c068..8c50ff4d9 100644
--- a/docs/user_guides/mlops/serving/transformer.md
+++ b/docs/user_guides/mlops/serving/transformer.md
@@ -157,7 +157,7 @@ my_deployment.save()
 
 ### API Reference
 
-[Transformer](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/transformer/)
+[Transformer](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/transformer_api/)
 
 ## Resources
 
diff --git a/docs/user_guides/mlops/serving/troubleshooting.md b/docs/user_guides/mlops/serving/troubleshooting.md
index 926022378..5de0b6933 100644
--- a/docs/user_guides/mlops/serving/troubleshooting.md
+++ b/docs/user_guides/mlops/serving/troubleshooting.md
@@ -134,6 +134,6 @@ deployment.get_logs(component="predictor|transformer", tail=10)
 
 ### API Reference
 
-[Deployment](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/deployment/)
+[Deployment](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/deployment_api/)
 
-[PredictorState](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/api/predictor-state/)
+[PredictorState](https://docs.hopsworks.ai/machine-learning-api/{{{ hopsworks_version }}}/generated/model-serving/predictor_state_api/)