diff --git a/Dockerfile b/Dockerfile
index b1919e8..f8318b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,19 @@
-FROM phusion/baseimage:0.9.16
+FROM aiko/baseimage-pi:0.9.16
 
-MAINTAINER Vojta Orgoň (villlem@gmail.com)
+MAINTAINER Aiko Mastboom (docker@aiko.sh)
 
 RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
-RUN add-apt-repository ppa:mosquitto-dev/mosquitto-ppa -y
-RUN apt-get update
-RUN apt-get install -y mosquitto mosquitto-clients
+#RUN  /bin/true \
+#  && apt-get update \
+#  && apt-get install -y python-software-properties \
+#  && add-apt-repository ppa:mosquitto-dev/mosquitto-ppa -y
+RUN  /bin/true \
+  && apt-get update \
+  && apt-get install -y mosquitto mosquitto-clients
+
+# Clean up APT when done.
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ADD mosquitto-broker.sh /etc/service/mosquitto-broker/run
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..23095df
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+DOCKER_IMAGE_VERSION=0.10.36
+DOCKER_IMAGE_NAME=aiko/rpi-node
+DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)
+
+default: build
+
+build:
+	docker build -t $(DOCKER_IMAGE_TAGNAME) .
+	docker tag -f $(DOCKER_IMAGE_TAGNAME) $(DOCKER_IMAGE_NAME):latest
+
+push:
+	docker push $(DOCKER_IMAGE_NAME)
+
+test:
+	docker run --rm $(DOCKER_IMAGE_TAGNAME) /bin/echo "Success."
+
+version:
+	docker run --rm $(DOCKER_IMAGE_TAGNAME) node --version
+	docker run --rm $(DOCKER_IMAGE_TAGNAME) npm --version