diff --git a/Dockerfile b/Dockerfile
index e69de29..ccdde58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM jlesage/baseimage-gui:debian-10
+  RUN apt-get update && apt-get install -y openscad
+
+  RUN sed-patch 's/<application type="normal">/<application type="normal" title="OpenSCAD">/' /etc/xdg/openbox/rc.xml && \
+    echo "#!/bin/sh\nexport HOME=/home\nexec openscad" > /startapp.sh
+
+  ENV APP_NAME="OpenSCAD"
+  ENV USER_ID=0
+  ENV GROUP_ID=0
+  ENV DISPLAY_WIDTH=2340
+  ENV DISPLAY_HEIGHT=1542
+  ENV KEEP_APP_RUNNING=1
diff --git a/Makefile b/Makefile
index 5573b96..c22a3ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .DEFAULT_GOAL := default
 
-IMAGE ?= docker.cluster.fun/private/docker-openscad:latest
+IMAGE ?= docker.cluster.fun/averagemarcus/openscad:latest
 
 .PHONY: test # Run all tests, linting and format checks
 test: lint check-format run-tests
@@ -78,4 +78,4 @@ help:
 	@echo "-----------------------------------"
 	@grep '^.PHONY: .* #' Makefile | sed 's/\.PHONY: \(.*\) # \(.*\)/\1	\2/' | expand -t20
 
-default: test build
+default: test docker-build
diff --git a/README.md b/README.md
index 0ea4b37..dceb012 100644
--- a/README.md
+++ b/README.md
@@ -4,28 +4,20 @@ Docker image containing OpenSCAD, accessible via web UI or VNC.
 
 ## Features
 
-## Install
-
-```sh
-
-```
+* Web based GUI (Port 5800)
+* VNC based access (Port 5900)
 
 ## Building from source
 
-With Docker:
-
 ```sh
 make docker-build
 ```
 
-Standalone:
-
-```sh
-make build
-```
-
 ## Resources
 
+* [docker-baseimage-gui](https://github.com/jlesage/docker-baseimage-gui)
+* [OpenSCAD](https://openscad.org/)
+
 ## Contributing
 
 If you find a bug or have an idea for a new feature please [raise an issue](issues/new) to discuss it.