diff --git a/Makefile b/Makefile
index 34306dd..7d12913 100644
--- a/Makefile
+++ b/Makefile
@@ -4,3 +4,15 @@ devserver:
 	@echo "Serving development site from $(DEV_DIST_DIR)"
 	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
 .PHONY: devserver
+
+dockerbuild:
+	@docker build -t autonomic/autonomic.zone:testing .
+.PHONY: dockerbuild
+
+dockerserver: dockerbuild
+	@docker run \
+		-e JEKYLL_PORT=4000 \
+		-e JEKYLL_HOST=0.0.0.0 \
+		-p 4000:4000 \
+		autonomic/autonomic.zone:testing
+.PHONY: dockerserver