diff --git a/manifests/profile/base/nova/compute/libvirt_guests.pp b/manifests/profile/base/nova/compute/libvirt_guests.pp
index cde2fdda4..0fefe23fc 100644
--- a/manifests/profile/base/nova/compute/libvirt_guests.pp
+++ b/manifests/profile/base/nova/compute/libvirt_guests.pp
@@ -31,26 +31,11 @@ class tripleo::profile::base::nova::compute::libvirt_guests (
   $step                          = Integer(hiera('step')),
   $enabled                       = undef,
 ) {
-  if $step >= 4 {
+  # only configure libvirt-guests if enabled
+  if $step >= 4 and $enabled {
     class { '::nova::compute::libvirt_guests':
-      enabled     => $enabled,
+      enabled => $enabled,
     }
     include ::nova::compute::libvirt_guests
-
-    #set dep to docker to make sure we shutdown instances before libvirt
-    #container stops
-    if str2bool(hiera('docker_enabled', false)) {
-      include ::systemd::systemctl::daemon_reload
-
-      Package<| name == 'docker' |>
-      -> file { '/etc/systemd/system/virt-guest-shutdown.target.wants':
-        ensure => directory,
-      }
-      -> systemd::unit_file { 'paunch-container-shutdown.service':
-        path   => '/etc/systemd/system/virt-guest-shutdown.target.wants',
-        target => '/usr/lib/systemd/system/paunch-container-shutdown.service',
-        before => Class['::nova::compute::libvirt_guests'],
-      }
-    }
   }
 }