diff --git a/Dockerfile b/Dockerfile
index 029610a92512da2c78a9d040b49cc8ae86d30161..7545f57d53750ac0fb4516f62c67e09ce8b11bb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:14.04
+MAINTAINER Nimrod Adar <nimrod@shore.co.il>
 RUN echo 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main' \
 > /etc/apt/sources.list.d/webupd8team-java-trusty.list && \
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..ba5bfc2618a90f0a545acfb187e673076b801306
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+all: build upload
+
+build:
+	docker build -t adarnimrod/sahi-phantomjs .
+
+push:
+	docker push adarnimrod/sahi-phantomjs