diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 745fb30f67..02dfc1220f 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1081,6 +1081,13 @@ outputs:
 
                     [Install]
                     WantedBy=multi-user.target
+              - name: Making sure virt-guest-shutdown.target is present
+                copy:
+                  dest: /etc/systemd/system/virt-guest-shutdown.target
+                  content: |
+                    [Unit]
+                    Description=Libvirt guests shutdown
+                    Documentation=https://libvirt.org
               - name: libvirt-guests enable VM shutdown on compute reboot/shutdown
                 systemd:
                   name: libvirt-guests
@@ -1115,6 +1122,13 @@ outputs:
 
                     [Install]
                     WantedBy=multi-user.target
+              - name: Making sure virt-guest-shutdown.target is present
+                copy:
+                  dest: /etc/systemd/system/virt-guest-shutdown.target
+                  content: |
+                    [Unit]
+                    Description=Libvirt guests shutdown
+                    Documentation=https://libvirt.org
               - name: tripleo_nova_libvirt_guests enable VM shutdown on compute reboot/shutdown
                 systemd:
                   name: tripleo_nova_libvirt_guests