diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
index b86f40d..7fadf2d 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
@@ -68,11 +68,13 @@
       flavor: { get_param: instance_flavor }
       image: { list_join: ['', [ 'ubuntu-vcp-', { get_param: mcp_version } ]] }
       key_name: { get_param: key_pair }
+      #hostname: { get_param: instance_name }
       availability_zone: { get_param: availability_zone }
-      name:
-        list_join:
-        - '.'
-        - [ { get_param: instance_name }, { get_param: instance_domain } ]
+      name: { get_param: instance_name }
+#      name:
+#        list_join:
+#        - '.'
+#        - [ { get_param: instance_name }, { get_param: instance_domain } ]
       networks:
       - port: { get_resource: instance_port01 }
       - port: { get_resource: instance_port02 }
@@ -85,7 +87,8 @@
           template: { get_param: underlay_userdata }
           #template: { get_file: ../../templates/{ get_param: lab_config_name }/underlay-userdata.yaml }
           params:
-            hostname: { list_join: ['.', [ { get_param: instance_name }, { get_param: instance_domain } ]] }
+            hostname: { get_param: instance_name }
+#            hostname: { list_join: ['.', [ { get_param: instance_name }, { get_param: instance_domain } ]] }
             $node_hostname: { get_param: instance_name }
             $node_domain: { get_param: instance_domain }
             $config_host: { get_param: instance_config_host }
diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
index 08612a9..94b75e4 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
@@ -107,10 +107,11 @@
       image: { list_join: ['', [ 'ubuntu-vcp-', { get_param: mcp_version } ]] }
       key_name: { get_param: key_pair }
       availability_zone: { get_param: availability_zone }
-      name:
-        list_join:
-        - '.'
-        - [ { get_param: instance_name }, { get_param: instance_domain } ]
+      name: { get_param: instance_name }
+#      name:
+#        list_join:
+#        - '.'
+#        - [ { get_param: instance_name }, { get_param: instance_domain } ]
       networks:
       - port: { get_resource: instance_port01 }
       - port: { get_resource: instance_port02 }