diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 92d4904771..0272d78db3 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -858,6 +858,9 @@ outputs:
               - service: libvirt
                 network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
                 type: node
+              - service: qemu
+                network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
+                type: node
             - null
           - if:
             - use_tls_for_vnc
@@ -866,13 +869,6 @@ outputs:
                 network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
                 type: node
             - null
-          - if:
-            - use_tls_for_nbd
-            -
-              - service: qemu
-                network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
-                type: node
-            - null
       upgrade_tasks:
         - name: nova_libvirt_container_tmpfile_cleanup
           when: step|int == 1