diff --git a/deployment/neutron/neutron-cleanup.service b/deployment/neutron/neutron-cleanup.service
index 53db312157..efbd07f798 100644
--- a/deployment/neutron/neutron-cleanup.service
+++ b/deployment/neutron/neutron-cleanup.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Neutron cleanup on startup
 After=openvswitch.service network.target
-Before=docker.service
+Before=tripleo_neutron_ovs_agent.service tripleo_neutron_dhcp.service tripleo_neutron_l3_agent.service tripleo_nova_compute.service
 RefuseManualStop=yes
 
 [Service]