diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index c4a0642..8655675 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -284,7 +284,8 @@
         self.__env.start()
         LOG.info('Environment "{0}" started'.format(self.__env.name))
         for node in self.__env.get_nodes(role__in=underlay_node_roles):
-            LOG.info("Waiting for SSH on node '{}...'".format(node.name))
+            LOG.info("Waiting for SSH on node '{0}' / {1} ...".format(
+                node.name, self.node_ip(node)))
             helpers.wait(
                 lambda: helpers.tcp_ping(self.node_ip(node), 22),
                 timeout=timeout,
diff --git a/tcp_tests/templates/ironic_standalone/underlay.yaml b/tcp_tests/templates/ironic_standalone/underlay.yaml
index 6a25ced..7232e3f 100644
--- a/tcp_tests/templates/ironic_standalone/underlay.yaml
+++ b/tcp_tests/templates/ironic_standalone/underlay.yaml
@@ -20,8 +20,8 @@
 
     address_pools:
 
-      ironic-pool01:
-        net: {{ os_env('IRONIC_ADDRESS_POOL01', '10.50.0.0/16:24') }}
+      admin-pool01:
+        net: {{ os_env('IRONIC_ADMIN_ADDRESS_POOL01', '10.50.0.0/16:24') }}
         params:
           ip_reserved:
             gateway: +1
@@ -30,7 +30,7 @@
           ip_ranges:
             dhcp: [+90, -10]
 
-      admin-pool01:
+      provisioning-pool01:
         net: {{ os_env('ADMIN_ADDRESS_POOL01', '10.70.0.0/16:24') }}
         params:
           ip_reserved:
@@ -50,29 +50,21 @@
             enable_acpi: true
             use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
 
-        network_pools:
-          admin: admin-pool01
-
         l2_network_devices:
           # Ironic management interface
-          ironic:
-            address_pool: ironic-pool01
+          admin:
+            address_pool: admin-pool01
             dhcp: true
             forward:
               mode: nat
 
           # PXE / Salt-master admin network
-          admin:
-            address_pool: admin-pool01
+          provisioning:
+            address_pool: provisioning-pool01
             dhcp: false
             parent_iface:
               phys_dev: !os_env BAREMETAL_ADMIN_IFACE, enp8s0f1
 
-        group_volumes:
-         - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
-           source_image: !os_env IMAGE_PATH1604  # https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img or
-                                             # http://apt.tcpcloud.eu/images/ubuntu-16-04-x64-201608231004.qcow2
-           format: qcow2
 
         nodes:
           - name: {{ HOSTNAME_IRONIC }}
@@ -87,7 +79,7 @@
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
+                  source_image: !os_env IMAGE_PATH1604
                   format: qcow2
                 - name: iso  # Volume with name 'iso' will be used
                              # for store image with cloud-init metadata.
@@ -100,12 +92,8 @@
 
               interfaces:
                 - label: ens3
-                  l2_network_device: ironic
-                  interface_model: *interface_model
-                - label: ens4
                   l2_network_device: admin
                   interface_model: *interface_model
-              network_config:
-                ens4:
-                  networks:
-                    - admin
+                - label: ens4
+                  l2_network_device: provisioning
+                  interface_model: *interface_model