diff --git a/deployment_scripts/puppet/manifests/qemu-install.pp b/deployment_scripts/puppet/manifests/qemu-install.pp
index e423141..e45b33c 100644
--- a/deployment_scripts/puppet/manifests/qemu-install.pp
+++ b/deployment_scripts/puppet/manifests/qemu-install.pp
@@ -4,9 +4,13 @@ if $operatingsystem == 'Ubuntu' {
         if $fuel_settings['fuel-plugin-qemu']['use_kvm'] {
                 package { 'linux-headers-4.1.10-rt10nfv':
                         ensure => "1.0.OPNFV",
-                }
+                } ->
                 package { 'linux-image-4.1.10-rt10nfv':
                         ensure => "1.0.OPNFV",
+                } ->
+                exec {'reboot':
+                       command => "reboot",
+                       path   => "/usr/bin:/usr/sbin:/bin:/sbin",
                 }
         } else {
                 package { 'qemu-block-extra':
diff --git a/tasks.yaml b/tasks.yaml
index fe53f14..6a5396c 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -6,9 +6,3 @@
     puppet_manifest: puppet/manifests/qemu-install.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
-- id: reboot
-  role: ['compute']
-  stage: pre_deployment
-  type: reboot
-  parameters:
-    timeout: 300