diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index abfbe0ca8a..a9c882a7a2 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -100,7 +100,7 @@ virt_install_command_two_nic: virt-install -n {{ inventory_hostname }}
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:none'
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:none'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
                  --autostart --noautoconsole --watchdog default --rng /dev/random
@@ -121,7 +121,7 @@ virt_install_command_two_nic_unsafe: virt-install -n {{ inventory_hostname }}
                  --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
                  'net.ifnames=0 ipv6.disable=1 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:on
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:on
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:on'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
@@ -134,7 +134,7 @@ virt_install_command_ppc64le_two_nic_unsafe: virt-install --machine pseries-4.0
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:none'
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:none'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
                  --autostart --noautoconsole --watchdog default --rng /dev/random
@@ -166,7 +166,7 @@ virt_install_command_aarch64_two_nic: virt-install -n {{ inventory_hostname }}
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }}
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:none'
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:none'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
                  --autostart --noautoconsole --rng /dev/random