diff --git a/etc/docker/daemon.json b/etc/docker/daemon.json
new file mode 100644
index 00000000..f1097647
--- /dev/null
+++ b/etc/docker/daemon.json
@@ -0,0 +1,6 @@
+{
+    "log-driver": "json-file",
+    "log-opts": { "max-size": "10m", "max-file": "5" },
+    "dns": ["172.17.0.1"],
+    "bip": "172.17.0.1/16"
+}
diff --git a/etc/systemd/resolved.conf.d/20-docker-dns.conf b/etc/systemd/resolved.conf.d/20-docker-dns.conf
new file mode 100644
index 00000000..2c7f5276
--- /dev/null
+++ b/etc/systemd/resolved.conf.d/20-docker-dns.conf
@@ -0,0 +1,2 @@
+[Resolve]
+DNSStubListenerExtra=172.17.0.1
diff --git a/etc/systemd/system/docker.service.d/no-block-boot.conf b/etc/systemd/system/docker.service.d/no-block-boot.conf
new file mode 100644
index 00000000..911bbfa0
--- /dev/null
+++ b/etc/systemd/system/docker.service.d/no-block-boot.conf
@@ -0,0 +1,2 @@
+[Unit]
+DefaultDependencies=no
diff --git a/install/config/docker.sh b/install/config/docker.sh
index 99096245..7da657a4 100644
--- a/install/config/docker.sh
+++ b/install/config/docker.sh
@@ -1,32 +1,4 @@
-# Configure Docker daemon:
-# - limit log size to avoid running out of disk
-# - use host's DNS resolver
-sudo mkdir -p /etc/docker
-sudo tee /etc/docker/daemon.json >/dev/null <<'EOF'
-{
-    "log-driver": "json-file",
-    "log-opts": { "max-size": "10m", "max-file": "5" },
-    "dns": ["172.17.0.1"],
-    "bip": "172.17.0.1/16"
-}
-EOF
-
-# Expose systemd-resolved to our Docker network
-sudo mkdir -p /etc/systemd/resolved.conf.d
-echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
-sudo systemctl restart systemd-resolved
-
-# Start Docker automatically
-sudo systemctl enable docker
-
-# Give this user privileged Docker access
 sudo usermod -aG docker ${USER}
-
-# Prevent Docker from preventing boot for network-online.target
-sudo mkdir -p /etc/systemd/system/docker.service.d
-sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
-[Unit]
-DefaultDependencies=no
-EOF
-
+sudo systemctl restart systemd-resolved
+sudo systemctl enable docker
 sudo systemctl daemon-reload