diff --git a/api/envoy/api/v2/core/address.proto b/api/envoy/api/v2/core/address.proto
index 88689e2648ce6..76b473e12b6b9 100644
--- a/api/envoy/api/v2/core/address.proto
+++ b/api/envoy/api/v2/core/address.proto
@@ -44,7 +44,7 @@ message SocketAddress {
   // address must be an IP (*STATIC* or *EDS* clusters) or a hostname resolved by DNS
   // (*STRICT_DNS* or *LOGICAL_DNS* clusters). Address resolution can be customized
   // via :ref:`resolver_name <envoy_api_field_core.SocketAddress.resolver_name>`.
-  string address = 2 [(validate.rules).string.min_bytes = 1];
+  string address = 2 [(validate.rules).string.address = true];
   oneof port_specifier {
     option (validate.required) = true;
     uint32 port_value = 3 [(validate.rules).uint32.lte = 65535];
diff --git a/configs/envoy_service_to_service_v2.template.yaml b/configs/envoy_service_to_service_v2.template.yaml
index 531322b3a14ba..fd83a40f609ac 100644
--- a/configs/envoy_service_to_service_v2.template.yaml
+++ b/configs/envoy_service_to_service_v2.template.yaml
@@ -398,11 +398,11 @@ static_resources:
         - endpoint:
             address:
               socket_address:
-                address: main_website.com
+                address: main.website.com
                 port_value: 443
                 protocol: TCP
     tls_context:
-      sni: www.main_website.com
+      sni: www.main.website.com
   - name: local_service
     connect_timeout: 0.25s
     type: STATIC
diff --git a/examples/lua/envoy.yaml b/examples/lua/envoy.yaml
index 4f98481091fb7..b4a00ffcf6800 100644
--- a/examples/lua/envoy.yaml
+++ b/examples/lua/envoy.yaml
@@ -52,7 +52,7 @@ static_resources:
         - endpoint:
             address:
               socket_address:
-                address: web_service
+                address: web.service.com
                 port_value: 80
 admin:
   access_log_path: "/dev/null"