diff --git a/unit-files/mysql-importer@.service b/unit-files/mysql-importer@.service
index 29ebd239dc7e21b41a4dd3ddeab0a2a7259c748f..d6787b7697624306c50538f09cb4b43f35fd0e07 100644
--- a/unit-files/mysql-importer@.service
+++ b/unit-files/mysql-importer@.service
@@ -1,7 +1,12 @@
 [Unit]
 Description=MySQL importer
+
+# Dependency ordering
 Before=mysql@%i.service
 
+# Dependency binding
+BindsTo=mysql@%i.service
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes
diff --git a/unit-files/nginx-discovery@.service b/unit-files/nginx-discovery@.service
index d9cd898e30c09557ad47ba391eaab35973f823b0..5f92079a9b806d2eb7ce6be39730118ecd15ebdf 100644
--- a/unit-files/nginx-discovery@.service
+++ b/unit-files/nginx-discovery@.service
@@ -3,7 +3,6 @@ Description=%p for %i etcd registration
 
 # Requirements
 Requires=etcd.service
-Requires=nginx@%i.service
 
 # Dependency ordering
 After=etcd.service
diff --git a/unit-files/nginx-importer@.service b/unit-files/nginx-importer@.service
index 9907c6e80900892c5fd493e76d576137e11286c7..9bec23163ba2c1c19fec47a4d9a5106c118b8eb0 100644
--- a/unit-files/nginx-importer@.service
+++ b/unit-files/nginx-importer@.service
@@ -4,6 +4,9 @@ Description=nginx importer
 # Dependency ordering
 Before=nginx@%i.service
 
+# Dependency binding
+BindsTo=mysql@%i.service
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes
diff --git a/unit-files/wordpress-discovery@.service b/unit-files/wordpress-discovery@.service
index 4621b158f9235c562d1ba79faecae334769a89d3..49be56619869eebe687035d2a5f680aade6d4ee3 100644
--- a/unit-files/wordpress-discovery@.service
+++ b/unit-files/wordpress-discovery@.service
@@ -3,7 +3,6 @@ Description=%p for %i etcd registration
 
 # Requirements
 Requires=etcd.service
-Requires=wordpress@%i.service
 
 # Dependency ordering
 After=etcd.service
diff --git a/unit-files/wordpress-importer@.service b/unit-files/wordpress-importer@.service
index 435d234d43d4b977050bf0c5503d1a849194b231..fb0b2c74419d1958b73a2b89f022e8675de17216 100644
--- a/unit-files/wordpress-importer@.service
+++ b/unit-files/wordpress-importer@.service
@@ -5,6 +5,9 @@ Description=WordPress importer
 After=mysql-importer@%i.service
 Before=wordpress@%i.service
 
+# Dependency binding
+BindsTo=wordpress@%i.service
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes