diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index b4aa5e44ca..8ac750107b 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -361,7 +361,7 @@ outputs:
             restart: always
             security_opt: 'label=disable'
             depends_on:
-              - openvswitch
+              - openvswitch.service
             healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
             ulimit: {get_param: DockerNeutronDHCPAgentUlimit}
             volumes:
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index a9ebfad756..051faf730b 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -325,7 +325,7 @@ outputs:
             privileged: true
             restart: always
             depends_on:
-              - openvswitch
+              - openvswitch.service
             healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
             ulimit: {get_param: DockerNeutronL3AgentUlimit}
             volumes:
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 1a06f3fa4e..1c3ca27b84 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -314,7 +314,7 @@ outputs:
             security_opt: 'label=disable'
             restart: always
             depends_on:
-              - openvswitch
+              - openvswitch.service
             healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
             ulimit: {get_param: DockerOpenvswitchUlimit}
             volumes:
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 30de4d93e1..a067870ca2 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -775,7 +775,7 @@ outputs:
                 user: nova
                 restart: always
                 depends_on:
-                  - tripleo_nova_libvirt
+                  - tripleo_nova_libvirt.service
                 healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
                 volumes:
                   list_concat:
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index c700644c60..29b9b20a2d 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -681,7 +681,7 @@ outputs:
             restart: always
             cpuset_cpus: all
             depends_on:
-              - tripleo_nova_virtlogd
+              - tripleo_nova_virtlogd.service
             healthcheck:
               test: '/openstack/healthcheck libvirtd'
             volumes:
diff --git a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
index 32275cad25..d2e1102221 100644
--- a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
+++ b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
@@ -60,7 +60,7 @@ outputs:
             security_opt: 'label=disable'
             restart: always
             depends_on:
-              - openvswitch
+              - openvswitch.service
             ulimit: {get_param: DockerOpenvswitchUlimit}
             volumes:
               list_concat: