diff --git a/RUNBOOK.md b/RUNBOOK.md
index e1a5c3d..d08ec49 100644
--- a/RUNBOOK.md
+++ b/RUNBOOK.md
@@ -136,11 +136,13 @@ kubectl exec -it -n forgejo deployment/forgejo-runner -- \
 
 ### After server restart (if pods have ImagePullBackOff)
 
-Kind container loses its DNS config on restart:
+This should no longer happen — `/etc/docker/daemon.json` is configured with `"dns": ["8.8.8.8"]` to prevent the router's broken IPv6 DNS from being injected into containers. The kind container also has `restart=always` so it auto-starts with Docker.
+
+If it does happen anyway (e.g. daemon.json was reset), quick fix:
 
 ```bash
 docker exec szymicluster-control-plane bash -c 'echo "nameserver 8.8.8.8" > /etc/resolv.conf'
-kubectl delete pods -n argocd --all
+kubectl delete pods -A --field-selector=status.phase!=Running 2>/dev/null
 ```
 
 ### Checking overall health
diff --git a/k8s/deploy-infrastructure.sh b/k8s/deploy-infrastructure.sh
index 8fd3955..34a95ba 100755
--- a/k8s/deploy-infrastructure.sh
+++ b/k8s/deploy-infrastructure.sh
@@ -6,7 +6,8 @@ cd "$SCRIPT_DIR/.."
 
 echo "=== Deploying Infrastructure ==="
 
-echo "0. Fixing kind container DNS (prevents ImagePullBackOff on IPv6-only DNS)..."
+echo "0. Configuring kind container restart policy and DNS..."
+docker update --restart=always szymicluster-control-plane
 docker exec szymicluster-control-plane bash -c 'echo "nameserver 8.8.8.8" > /etc/resolv.conf'
 
 echo "1. Creating required host data directories..."
diff --git a/k8s/infrastructure/coredns/coredns-custom.yaml b/k8s/infrastructure/coredns/coredns-custom.yaml
index dd738a2..7c48f28 100644
--- a/k8s/infrastructure/coredns/coredns-custom.yaml
+++ b/k8s/infrastructure/coredns/coredns-custom.yaml
@@ -25,7 +25,7 @@ data:
            ttl 30
         }
         prometheus :9153
-        forward . /etc/resolv.conf {
+        forward . 8.8.8.8 8.8.4.4 {
            max_concurrent 1000
         }
         cache 30 {