diff --git a/README.md b/README.md
index d0373eb..d78af6b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 ## TODO
 ### nsd
 
-- Change IPv6 addresses
 - ZSK rollover.
 - I always resign the zone, even if nothing has changed.
 I could check whether the zone has changed or new keys were generated but that is kind of difficult.
diff --git a/roles/docker/files/daemon.json b/roles/docker/files/daemon.json
new file mode 100644
index 0000000..8cef55b
--- /dev/null
+++ b/roles/docker/files/daemon.json
@@ -0,0 +1,3 @@
+{
+  "ipv6": true
+}
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index dfef31a..6d8d1ce 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -29,3 +29,13 @@
     name:
       - docker
       - docker-compose
+- name: Enable IPv6
+  copy:
+    src: "{{ role_path }}/files/daemon.json"
+    dest: /etc/docker/daemon.json
+  register: daemon_file
+- name: Start Docker
+  systemd:
+    name: docker
+    enabled: true
+    state: "{{ 'reloaded' if daemon_file.changed else 'started' }}"
diff --git a/roles/nsd/files/nsd.conf b/roles/nsd/files/nsd.conf
index 151373c..20245a0 100644
--- a/roles/nsd/files/nsd.conf
+++ b/roles/nsd/files/nsd.conf
@@ -1,8 +1,11 @@
 server:
+        ip-address: eth0 # TEMP until response from mailing list
         server-count: 1
         verbosity: 1
         hide-version: yes
         zonesdir: "/zones"
+        ip-transparent: yes
+        ip-freebind: yes
 
 zone:
         name: pizzapim.nl