diff --git a/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp b/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp
index d6ce9e5f..ec7c5fa0 100644
--- a/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp
+++ b/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp
@@ -32,7 +32,7 @@
               apply => "immediately",
               timeout => 0,
               message => "Rebooting for kernel upgrade",
-              subscribe       => Package[$image_extra],
+              subscribe       => [Package[$image_extra], Package[$headers], Package[$headers_generic], Package[$image]],
             }
         } else {
             if ($contrail_kernel_version == "" ) {
@@ -55,7 +55,7 @@
             package { $image : ensure => present, notify => Reboot["after"], }
             ->
             reboot { 'after':
-              subscribe       => Package[$image],
+              subscribe       => [Package[$image_extra], Package[$headers], Package[$headers_generic], Package[$image]],
               apply => "immediately",
               message => "Rebooting for kernel upgrade",
               timeout => 0,