diff --git a/playbooks/roles/nameserver/tasks/main.yaml b/playbooks/roles/nameserver/tasks/main.yaml
index 21a83de3f8..e2e187116c 100644
--- a/playbooks/roles/nameserver/tasks/main.yaml
+++ b/playbooks/roles/nameserver/tasks/main.yaml
@@ -17,6 +17,25 @@
   package:
     name:
       - nsd
+- name: Create nsd unit file override dir
+  file:
+    path: /etc/systemd/system/nsd.service.d
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+- name: Create nsd unit file override config
+  # This is necessary to force nsd to start after networking is up.
+  # Upstream package is broken when not listening on :: or ::1
+  copy:
+    owner: root
+    group: root
+    mode: 0644
+    dest: /etc/systemd/system/nsd.service.d/deps.conf
+    content: |
+      [Unit]
+      After=network-online.target
+      Wants=network-online.target
 - name: Enable NSD
   service:
     name: nsd