diff --git a/services/terraform/remote/service_identity.tf b/services/terraform/remote/service_identity.tf
--- a/services/terraform/remote/service_identity.tf
+++ b/services/terraform/remote/service_identity.tf
@@ -46,6 +46,10 @@
         {
           name  = "KEYSERVER_PUBLIC_KEY"
           value = nonsensitive(local.secrets["keyserverPublicKey"])
+        },
+        {
+          name  = "TUNNELBROKER_GRPC_ENDPOINT"
+          value = local.tunnelbroker_local_grpc_url
         }
       ]
       secrets = [
diff --git a/services/terraform/remote/service_tunnelbroker.tf b/services/terraform/remote/service_tunnelbroker.tf
--- a/services/terraform/remote/service_tunnelbroker.tf
+++ b/services/terraform/remote/service_tunnelbroker.tf
@@ -7,8 +7,14 @@
     websocket_port = 51001
     container_name = "tunnelbroker-server"
     domain_name    = "tunnelbroker.${local.root_domain}"
+
+    local_dns_name = "tunnelbroker"
+    grpc_port_name = "tunnelbroker_grpc"
   }
 
+  # Used for other services to connect to Tunnelbroker gRPC endpoint
+  tunnelbroker_local_grpc_url = "http://${local.tunnelbroker_config.local_dns_name}:${local.tunnelbroker_config.grpc_port}"
+
   # utility locals
   tunnelbroker_docker_image = "${local.tunnelbroker_config.docker_image}:${local.tunnelbroker_config.docker_tag}"
   rabbitmq_password         = local.secrets.amqpPassword[local.environment]
@@ -53,7 +59,7 @@
           appProtocol   = "http"
         },
         {
-          name          = "tunnelbroker_grpc"
+          name          = local.tunnelbroker_config.grpc_port_name
           containerPort = local.tunnelbroker_config.grpc_port
           protocol      = "tcp"
           appProtocol   = "grpc"
@@ -123,6 +129,14 @@
 
   service_connect_configuration {
     enabled = true
+    service {
+      discovery_name = local.tunnelbroker_config.local_dns_name
+      port_name      = local.tunnelbroker_config.grpc_port_name
+      client_alias {
+        port     = local.tunnelbroker_config.grpc_port
+        dns_name = local.tunnelbroker_config.local_dns_name
+      }
+    }
   }
 
   # Websocket