diff --git a/manifest-generation/diego.yml b/manifest-generation/diego.yml
index 68597b4734..60cf26d1e3 100644
--- a/manifest-generation/diego.yml
+++ b/manifest-generation/diego.yml
@@ -482,6 +482,7 @@ properties:
   # -- Properties below are used by the etcd from etcd-release --
   etcd:
     machines: ["etcd.service.cf.internal"]
+    advertise_urls_dns_suffix: "etcd.service.cf.internal"
     cluster:
       - name: "database_z1"
         instances: (( instance_count_overrides.database_z1.instances || 1 ))