diff --git a/osa_toolkit/generate.py b/osa_toolkit/generate.py
index c4a085603a..7adcca90a8 100755
--- a/osa_toolkit/generate.py
+++ b/osa_toolkit/generate.py
@@ -644,7 +644,10 @@ def _add_additional_networks(key, inventory, ip_q, q_name, netmask, interface,
                 cphg = container.get('physical_host_group')
 
                 # user_config data from the container physical host group
-                phg = user_config[cphg][container_host]
+                if user_config[cphg].get(container_host) is not None:
+                    phg = user_config[cphg][container_host]
+                else:
+                    phg = user_config[cphg][physical_host]
                 network['address'] = phg['ip']
 
         if is_ssh_address is True: