diff --git a/Dockerfile b/Dockerfile
index a139107..2237e4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM radioastro/base:0.1
+FROM radioastro/base:0.2
 
 MAINTAINER gijsmolenaar@gmail.com
 
@@ -12,6 +12,7 @@ RUN apt-get update && \
         python-qt4 \
         python-qwt5-qt4 \
         python-setuptools \
+        python-pip \
         libicu52 \
         lofar \
     &&  \
@@ -19,6 +20,6 @@ RUN apt-get update && \
 
 ADD . /tmp/tigger
 
-RUN cd /tmp/tigger && python setup.py install
+RUN cd /tmp/tigger && pip install .
 
 ENTRYPOINT /usr/local/bin/tigger
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..fd9f624
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+DOCKER_REPO=radioastro/tigger:1.3.3
+
+.PHONY: build clean
+
+all: build
+
+build:
+	docker build -t ${DOCKER_REPO} .
+
+clean:
+	docker rmi ${DOCKER_REPO}
+
+upload: build
+	docker push ${DOCKER_REPO}