diff --git a/Makefile b/Makefile
index e28ea0a9..de77b0c9 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ caddy-down:
 
 .PHONY: caddy
 caddy: caddy-down
-	docker run -v $(shell pwd):/srv -p 2015:2015 --name caddy -d abiosoft/caddy
+	docker run -v $(shell pwd):/srv -p 20015:2015 --name caddy -d abiosoft/caddy
 
 .PHONY: build-hammer-image
 build-hammer-image:
diff --git a/docker-compose.yml b/docker-compose.yml
index 838155d4..24f8e529 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,10 @@ services:
       - K8S_AUTH_KUBECONFIG=/mini-lab/.kubeconfig
     network_mode: host
     working_dir: /mini-lab
+    dns:
+      - 192.168.121.1
+      - 1.1.1.1
+      - 1.0.0.1
     entrypoint:
       - /bin/bash
       - -ce
@@ -50,6 +54,10 @@ services:
       - ANSIBLE_VAGRANT_CACHE_MAX_AGE=0
     network_mode: host
     working_dir: /mini-lab
+    dns:
+      - 192.168.121.1
+      - 1.1.1.1
+      - 1.0.0.1
     entrypoint:
       - /bin/bash
       - -ce
@@ -71,4 +79,8 @@ services:
     volumes:
       - ${HOME}/.ssh:/root/.ssh:ro
     network_mode: host
+    dns:
+      - 192.168.121.1
+      - 1.1.1.1
+      - 1.0.0.1
     command: --version
diff --git a/files/dev_images.yaml b/files/dev_images.yaml
index d690b3b4..1dd715eb 100644
--- a/files/dev_images.yaml
+++ b/files/dev_images.yaml
@@ -3,4 +3,4 @@
 metal_api_image_tag: dev
 metal_core_image_name: 192.168.121.1:5000/metalstack/metal-core
 metal_core_image_tag: dev
-metal_hammer_image_url: http://192.168.121.1:2015/metal-hammer-initrd.img.lz4
+metal_hammer_image_url: http://192.168.121.1:20015/metal-hammer-initrd.img.lz4