diff --git a/Makefile b/Makefile
index 4cb640ef16..532a691408 100644
--- a/Makefile
+++ b/Makefile
@@ -212,6 +212,10 @@ build: validate-bind-dir bundles
 shell: build  ## start a shell inside the build env
 	$(DOCKER_RUN_DOCKER) bash
 
+.PHONY: dev
+dev: build  ## start a dev mode inside the build env
+	$(DOCKER_RUN_DOCKER) hack/dev.sh
+
 .PHONY: test
 test: build test-unit ## run the unit, integration and docker-py tests
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-integration test-docker-py
diff --git a/hack/dev.sh b/hack/dev.sh
new file mode 100755
index 0000000000..3df215a525
--- /dev/null
+++ b/hack/dev.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+while true; do
+	if ! ./hack/make.sh binary; then
+		# If the build fails, sleep for 5 seconds and continue
+		sleep 5
+		continue
+	fi
+	KEEPBUNDLE=1 ./hack/make.sh install-binary || continue
+
+	dockerd --debug || true
+	sleep 0.1
+done