diff --git a/catalog/v4.19/Dockerfile b/catalog/v4.19/Dockerfile
index 0b2d2dc02d..a033eb5934 100644
--- a/catalog/v4.19/Dockerfile
+++ b/catalog/v4.19/Dockerfile
@@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL=
 ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT=
 ARG ODH_MAAS_API_GIT_URL=
 ARG ODH_MAAS_API_GIT_COMMIT=
 ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL=
@@ -255,10 +255,10 @@ LABEL \
       odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \
       odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \
       odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \
-      odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \
-      odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \
-      odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \
-      odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \
+      odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \
+      odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \
+      odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \
+      odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \
       odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \
       odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \
       odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \
diff --git a/catalog/v4.20/Dockerfile b/catalog/v4.20/Dockerfile
index a988529469..2a0ae25ba4 100644
--- a/catalog/v4.20/Dockerfile
+++ b/catalog/v4.20/Dockerfile
@@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL=
 ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT=
 ARG ODH_MAAS_API_GIT_URL=
 ARG ODH_MAAS_API_GIT_COMMIT=
 ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL=
@@ -255,10 +255,10 @@ LABEL \
       odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \
       odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \
       odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \
-      odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \
-      odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \
-      odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \
-      odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \
+      odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \
+      odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \
+      odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \
+      odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \
       odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \
       odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \
       odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \
diff --git a/catalog/v4.21/Dockerfile b/catalog/v4.21/Dockerfile
index 2cb7800153..fed78fdb5d 100644
--- a/catalog/v4.21/Dockerfile
+++ b/catalog/v4.21/Dockerfile
@@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL=
 ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT=
 ARG ODH_MAAS_API_GIT_URL=
 ARG ODH_MAAS_API_GIT_COMMIT=
 ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL=
@@ -257,10 +257,10 @@ LABEL \
       odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \
       odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \
       odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \
-      odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \
-      odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \
-      odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \
-      odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \
+      odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \
+      odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \
+      odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \
+      odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \
       odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \
       odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \
       odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \
diff --git a/catalog/v4.22/Dockerfile b/catalog/v4.22/Dockerfile
index a29601d791..8041d2755f 100644
--- a/catalog/v4.22/Dockerfile
+++ b/catalog/v4.22/Dockerfile
@@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL=
 ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL=
 ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL=
-ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL=
-ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL=
+ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL=
+ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT=
 ARG ODH_MAAS_API_GIT_URL=
 ARG ODH_MAAS_API_GIT_COMMIT=
 ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL=
@@ -257,10 +257,10 @@ LABEL \
       odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \
       odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \
       odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \
-      odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \
-      odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \
-      odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \
-      odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \
+      odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \
+      odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \
+      odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \
+      odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \
       odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \
       odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \
       odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \