diff --git a/controllers/modelmesh/runtime.go b/controllers/modelmesh/runtime.go
index dfe0ae5a..4a732a3e 100644
--- a/controllers/modelmesh/runtime.go
+++ b/controllers/modelmesh/runtime.go
@@ -15,6 +15,7 @@ package modelmesh
 
 import (
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -187,15 +188,38 @@ func (m *Deployment) addRuntimeToDeployment(deployment *appsv1.Deployment) error
 			ReadOnly:  true,
 		})
 
+		var rtDataEndpoint string
+		if rt.Spec.GrpcDataEndpoint != nil {
+			rtDataEndpoint = *rt.Spec.GrpcDataEndpoint
+			if err := addDomainSocketMount(rt, &builtInAdapterContainer); err != nil {
+				return err
+			}
+		} else {
+			rtDataEndpoint = fmt.Sprintf("port:%d", rt.Spec.BuiltInAdapter.RuntimeManagementPort)
+		}
+
+		adapterPort := "8085"
+		if rt.Spec.GrpcMultiModelManagementEndpoint != nil {
+			ep := *rt.Spec.GrpcMultiModelManagementEndpoint
+			if match, _ := regexp.MatchString("^port:[0-9]+$", ep); !match {
+				return fmt.Errorf("Built-in adapter grpcEndpoint must be of the form \"port:N\": %s", ep)
+			}
+			adapterPort = strings.TrimPrefix(ep, "port:")
+		}
+
 		builtInAdapterContainer.Env = []corev1.EnvVar{
 			{
 				Name:  "ADAPTER_PORT",
-				Value: "8085",
+				Value: adapterPort,
 			},
 			{
 				Name:  "RUNTIME_PORT",
 				Value: strconv.Itoa(rt.Spec.BuiltInAdapter.RuntimeManagementPort),
 			},
+			{
+				Name:  "RUNTIME_DATA_ENDPOINT",
+				Value: rtDataEndpoint,
+			},
 			{
 				Name: "CONTAINER_MEM_REQ_BYTES",
 				ValueFrom: &corev1.EnvVarSource{
@@ -222,7 +246,7 @@ func (m *Deployment) addRuntimeToDeployment(deployment *appsv1.Deployment) error
 				Value: runtimeVersion,
 			},
 			{}, {}, {}, {}, // allocate larger array to avoid reallocation
-		}[:7]
+		}[:8]
 
 		if mlc, ok := rt.Annotations["maxLoadingConcurrency"]; ok {
 			builtInAdapterContainer.Env = append(builtInAdapterContainer.Env, corev1.EnvVar{
diff --git a/controllers/testdata/servingruntime_controller.golden b/controllers/testdata/servingruntime_controller.golden
index 07367ab0..e9b259bc 100644
--- a/controllers/testdata/servingruntime_controller.golden
+++ b/controllers/testdata/servingruntime_controller.golden
@@ -50,6 +50,8 @@ spec:
           value: "8085"
         - name: RUNTIME_PORT
           value: "8001"
+        - name: RUNTIME_DATA_ENDPOINT
+          value: port:8001
         - name: CONTAINER_MEM_REQ_BYTES
           valueFrom:
             resourceFieldRef:
@@ -362,6 +364,8 @@ spec:
           value: "8085"
         - name: RUNTIME_PORT
           value: "8001"
+        - name: RUNTIME_DATA_ENDPOINT
+          value: port:8001
         - name: CONTAINER_MEM_REQ_BYTES
           valueFrom:
             resourceFieldRef:
@@ -566,6 +570,8 @@ spec:
           value: "8085"
         - name: RUNTIME_PORT
           value: "8001"
+        - name: RUNTIME_DATA_ENDPOINT
+          value: port:8001
         - name: CONTAINER_MEM_REQ_BYTES
           valueFrom:
             resourceFieldRef:
@@ -810,6 +816,8 @@ spec:
           value: "8085"
         - name: RUNTIME_PORT
           value: "8888"
+        - name: RUNTIME_DATA_ENDPOINT
+          value: port:8001
         - name: CONTAINER_MEM_REQ_BYTES
           valueFrom:
             resourceFieldRef:
@@ -1046,6 +1054,8 @@ spec:
           value: "8085"
         - name: RUNTIME_PORT
           value: "8001"
+        - name: RUNTIME_DATA_ENDPOINT
+          value: port:8001
         - name: CONTAINER_MEM_REQ_BYTES
           valueFrom:
             resourceFieldRef: