diff --git a/functions/create_hosts.sh b/functions/create_hosts.sh
index e6aaa0f..44530c3 100755
--- a/functions/create_hosts.sh
+++ b/functions/create_hosts.sh
@@ -4,7 +4,7 @@ function create_manager_host {
   # Outer parenthesis converts string to an array
   nsx_manager_ips=($(echo "$nsx_manager_ips_int" | sed -e 's/,/ /g'))
   manager_ip=${nsx_manager_ips[0]}
-  manager_hostname="${nsx_manager_hostname_prefix_int-1}"
+  manager_hostname="${nsx_manager_hostname_prefix_int}-1"
   # The following need to be placed under [localhost:vars] section
   cat >> manager_host <<-EOF
 
diff --git a/nsxt_yaml/basic_topology.yml b/nsxt_yaml/basic_topology.yml
index a7810c2..4be538f 100644
--- a/nsxt_yaml/basic_topology.yml
+++ b/nsxt_yaml/basic_topology.yml
@@ -12,7 +12,7 @@
         datastore: "{{hostvars['localhost'].vcenter_datastore}}"
         portgroup: "{{hostvars['localhost'].mgmt_portgroup}}"
         cluster: "{{hostvars['localhost'].vcenter_cluster}}"
-        vmname: "{{hostvars['localhost'].nsx_manager_assigned_hostname}}-1"
+        vmname: "{{hostvars['localhost'].nsx_manager_assigned_hostname}}"
         hostname: "{{hostvars['localhost'].nsx_manager_assigned_hostname}}.{{hostvars['localhost'].dns_domain}}"
         dns_server: "{{hostvars['localhost'].dns_server}}"
         dns_domain: "{{hostvars['localhost'].dns_domain}}"