diff --git a/deployment/puppet/deployment_groups/tasks.yaml b/deployment/puppet/deployment_groups/tasks.yaml
index b63a4cf0eb..635fe9b96b 100644
--- a/deployment/puppet/deployment_groups/tasks.yaml
+++ b/deployment/puppet/deployment_groups/tasks.yaml
@@ -122,9 +122,9 @@
     strategy:
       type: parallel
 
-- id: kvm-virt
+- id: virt
   type: group
-  role: [kvm-virt]
+  role: [virt]
   required_for: [deploy_end]
   parameters:
     strategy:
diff --git a/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp b/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp
index 789dceffe9..1a154d66ec 100644
--- a/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp
+++ b/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp
@@ -43,7 +43,6 @@ vm_config { $vms:
 
 exec { 'generate_vms':
   command     => "/usr/bin/generate_vms.sh ${libvirt_dir} ${template_dir}",
-  onlyif      => "test `virsh -q list | wc -l` -lt 1",
   refreshonly => true,
   path        => ['/usr/sbin', '/usr/bin' , '/sbin', '/bin'],
   notify      => Service[$libvirt_service_name],
diff --git a/deployment/puppet/osnailyfacter/modular/generate_vms/tasks.yaml b/deployment/puppet/osnailyfacter/modular/generate_vms/tasks.yaml
index fe98ba93cd..bf9007aa32 100644
--- a/deployment/puppet/osnailyfacter/modular/generate_vms/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/generate_vms/tasks.yaml
@@ -1,6 +1,6 @@
 - id: generate_vms
   type: puppet
-  groups: [kvm-virt]
+  groups: [virt]
   requires: [netconfig]
   required_for: [deploy_end]
   parameters:
diff --git a/deployment/puppet/osnailyfacter/modular/globals/tasks.yaml b/deployment/puppet/osnailyfacter/modular/globals/tasks.yaml
index 6959da0e95..5a2ed0704e 100644
--- a/deployment/puppet/osnailyfacter/modular/globals/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/globals/tasks.yaml
@@ -2,7 +2,7 @@
   type: puppet
   groups: [primary-controller, controller,
            cinder, cinder-vmware, compute, ceph-osd,
-           zabbix-server, primary-mongo, mongo]
+           zabbix-server, primary-mongo, mongo, virt]
   required_for: [deploy_end]
   requires: [hiera]
   parameters:
diff --git a/deployment/puppet/osnailyfacter/modular/hiera/tasks.yaml b/deployment/puppet/osnailyfacter/modular/hiera/tasks.yaml
index e07e149b3e..1fd4fc0359 100644
--- a/deployment/puppet/osnailyfacter/modular/hiera/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/hiera/tasks.yaml
@@ -1,6 +1,6 @@
 - id: hiera
   type: puppet
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
+  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
   requires: [deploy_start]
   required_for: [deploy_end]
   parameters:
diff --git a/deployment/puppet/osnailyfacter/modular/logging/tasks.yaml b/deployment/puppet/osnailyfacter/modular/logging/tasks.yaml
index 16691c1c22..8e075177bd 100644
--- a/deployment/puppet/osnailyfacter/modular/logging/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/logging/tasks.yaml
@@ -1,6 +1,6 @@
 - id: logging
   type: puppet
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
+  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
   required_for: [deploy_end]
   requires: [globals]
   parameters:
diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml b/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml
index 5c96dc3415..8fa8bffb08 100644
--- a/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml
@@ -1,6 +1,6 @@
 - id: netconfig
   type: puppet
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
+  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
   required_for: [deploy_end]
   requires: [tools]
   parameters:
@@ -14,7 +14,7 @@
 
 - id: connectivity_tests
   type: puppet
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
+  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
   required_for: [firewall, hosts]
   requires: [netconfig]
   parameters:
diff --git a/deployment/puppet/osnailyfacter/modular/tools/tasks.yaml b/deployment/puppet/osnailyfacter/modular/tools/tasks.yaml
index 31c23aa43a..ea66c19f18 100644
--- a/deployment/puppet/osnailyfacter/modular/tools/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/tools/tasks.yaml
@@ -1,6 +1,6 @@
 - id: tools
   type: puppet
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
+  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
   required_for: [deploy_end]
   requires: [logging]
   parameters:
diff --git a/files/fuel-misc/generate_vms.sh b/files/fuel-misc/generate_vms.sh
index dfa18015e1..1014f7cf7d 100755
--- a/files/fuel-misc/generate_vms.sh
+++ b/files/fuel-misc/generate_vms.sh
@@ -47,7 +47,7 @@ create_vm_disks() {
       continue
     fi
 
-    qemu-img create -f $DISK_FORMAT $DISK_PATH $DISK_SIZE
+    qemu-img create -f $DISK_FORMAT $DISK_PATH $DISK_SIZE || exit 2
 
   done
 }
@@ -85,18 +85,20 @@ do
   VM_NAME=$(basename $TEMPLATE_XML | cut -f1 -d".")
   DST_XML=${LIBVIRT_DIR}/${VM_NAME}.xml
 
+  #Copy VMs xml file to libvirt and ensure autostart
+  if ! [[ -h "${LIBVIRT_DIR}/autostart/$VM_NAME.xml" ]]; then
+    ln -s $DST_XML ${LIBVIRT_DIR}/autostart/
+  fi
+  cp -f $TEMPLATE_XML $DST_XML
+
   #Create disks for VMs
-  create_vm_disks $VM_NAME $TEMPLATE_XML
+  create_vm_disks $VM_NAME $DST_XML
 
   #Verify cpu settings
-  verify_cpu $VM_NAME $TEMPLATE_XML
+  verify_cpu $VM_NAME $DST_XML
 
   #Verify memory settings
-  verify_mem $VM_NAME $TEMPLATE_XML
-
-  #Copy VMs xml file to libvirt and ensure autostart
-  ln -s $DST_XML ${LIBVIRT_DIR}/autostart/
-  cp -f $TEMPLATE_XML $DST_XML
+  verify_mem $VM_NAME $DST_XML
 
 done
 
diff --git a/tests/noop/astute.yaml/neut_gre.generate_vms.yaml b/tests/noop/astute.yaml/neut_gre.generate_vms.yaml
index 39cc2324ea..20682f8131 100644
--- a/tests/noop/astute.yaml/neut_gre.generate_vms.yaml
+++ b/tests/noop/astute.yaml/neut_gre.generate_vms.yaml
@@ -201,7 +201,7 @@ network_metadata:
       user_node_name: Untitled (6a:e7)
       node_roles:
         - compute
-        - kvm-virt
+        - virt
       name: node-128
     node-129:
       swift_zone: '1'
@@ -481,7 +481,7 @@ nodes:
   name: node-128
   public_address: 172.16.0.2
   public_netmask: 255.255.255.0
-  role: kvm-virt
+  role: virt
   storage_address: 192.168.1.2
   storage_netmask: 255.255.255.0
   swift_zone: '128'
@@ -661,7 +661,7 @@ repo_setup:
     type: deb
     uri: http://mirror.fuel-infra.org/mos/ubuntu/
 resume_guests_state_on_host_boot: true
-role: kvm-virt
+role: virt
 sahara:
   db_password: f0jl4v47
   enabled: false