diff --git a/handlers/main.yml b/handlers/main.yml
index e4fb632..e1935cf 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Restart systemd-networkd
+- name: Restart networkd
   systemd:
     name: "systemd-networkd"
     state: restarted
@@ -22,9 +22,15 @@
   poll: 0
   when:
     - systemd_run_networkd | bool
+  listen: Restart systemd-networkd
   tags:
     - systemd-networkd
 
+- name: (RE)Gather facts post setup
+  setup:
+    gather_subset: "network"
+  listen: Restart systemd-networkd
+
 - name: Restart systemd-resolved
   systemd:
     name: "systemd-resolved"
diff --git a/tasks/main.yml b/tasks/main.yml
index c9bc7b9..0b7f1e0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -130,11 +130,9 @@
     name: "systemd-networkd"
     enabled: "yes"
     state: started
+  async: 45
+  poll: 0
   when:
     - systemd_run_networkd | bool
   tags:
     - systemd-networkd
-
-- name: (RE)Gather facts post setup
-  setup:
-    gather_subset: "network"