diff --git a/roles/dch-storage-net/files/wait-global-address.service b/roles/dch-storage-net/files/wait-global-address.service
index 86cb769..7cc9a49 100644
--- a/roles/dch-storage-net/files/wait-global-address.service
+++ b/roles/dch-storage-net/files/wait-global-address.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Wait for global address on %I
 Requires=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
 After=network-pre.target
 Before=network-online.target
 
diff --git a/roles/dch-storage-net/tasks/main.yml b/roles/dch-storage-net/tasks/main.yml
index 4da1957..49d56e2 100644
--- a/roles/dch-storage-net/tasks/main.yml
+++ b/roles/dch-storage-net/tasks/main.yml
@@ -10,6 +10,7 @@
     mode=0644
   notify: reload systemd
 
+- meta: flush_handlers
 - name: ensure wait-global-address service starts at boot
   service:
     name=wait-global-address@{{ storage_iface }}.service