diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
index bfeed34..3513ecc 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
@@ -87,9 +87,6 @@
 
     # vSRX IPs for tcp-qa images have 172.16.10.90 hardcoded
     find /srv/salt/reclass/ -type f -exec sed -i 's/opencontrail_router01_address:.*/opencontrail_router01_address: 172.16.10.90/g' {} +
-    # Replace VIP with IP of first controller. It should be removed when Kube-API VIP will be moved out of ens4/vhost0
-    find /srv/salt/reclass/ -type f -exec sed -i 's/ipf_addresses:.*/ipf_addresses: ${_param:cluster_node01_address}/g' {} +
-    perl -pi -e 's/vhost0/ens4/g' /srv/salt/reclass/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
 
     # Disable checkouting the model from remote repository
     cat << 'EOF' >> /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml
index a12b4a7..677a87b 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data-cfg01.yaml
@@ -59,8 +59,7 @@
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
 
-   - apt-get clean
-   - apt-get update
+   - eatmydata apt-get clean && eatmydata apt-get update
 
    # Install common packages
    - eatmydata apt-get install -y python-pip git curl tmux byobu iputils-ping traceroute htop tree
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
index bb5d765..438d65c 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
@@ -8,7 +8,7 @@
 
 ---
 aliases:
- - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
+ - &interface_model {{ os_env('INTERFACE_MODEL', 'e1000') }}
  - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
  - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
  - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
@@ -558,13 +558,13 @@
               interfaces:
                 - label: ge-0/0/0
                   l2_network_device: private
-                  interface_model: virtio
+                  interface_model: *interface_model
                   mac_address: 52:54:00:4e:b4:36
                 - label: ge-0/0/1
                   l2_network_device: public
-                  interface_model: virtio
+                  interface_model: *interface_model
                   mac_address: 52:54:00:e1:44:9d
                 - label: ge-0/0/2
                   l2_network_device: admin
-                  interface_model: virtio
+                  interface_model: *interface_model
                   mac_address: 52:54:00:72:08:77