diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml
index 941cbeab7..3bf96046c 100644
--- a/config/general_config/featureset027.yml
+++ b/config/general_config/featureset027.yml
@@ -17,6 +17,8 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
+undercloud_undercloud_public_host: "{{ ansible_fqdn }}-unique"
+tripleo_set_unique_hostname: true
 undercloud_resource_registry_args:
   "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/net-config-undercloud.yaml"