diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index f082181bbe..b33aaf0e6a 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -929,7 +929,12 @@ outputs:
                 user: nova
                 restart: always
                 depends_on:
-                  - tripleo_nova_libvirt.service
+                  list_concat:
+                    - - tripleo_nova_libvirt.service
+                    - if:
+                      - {get_param: NovaNfsEnabled}
+                      - - var-lib-nova-instances.mount
+                      - []
                 healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
                 volumes:
                   list_concat: