diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..783cd5b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+
diff --git a/Dockerfile b/Dockerfile
index b313dfd..58ca1b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,19 @@
 FROM		alpine:edge
-MAINTAINER	Jona Reichmann
+LABEL		maintainer="Jona Reichmann"
 
 RUN	apk update \
 	&& apk upgrade \
 	&& apk add \
 		curl \
-		jq
+		jq \
+		openjdk8-jre
 
 ADD fsRoot /
 
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
+
+ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
+
+RUN ["java", "-version"]
+
 CMD ["bash", "-c", "/opt/minecraft/entrypoint.sh"]