diff --git a/.travis.yml b/.travis.yml
index 54cec28..8e5c991 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ services:
 cache:
   directories:
     - $HOME/.cache/pip
-    - /var/lib/docker/image
-    - /var/lib/docker/containers
-    - /var/lib/docker/aufs
 
 env:
   SSL_KEY: nginx.key
diff --git a/wiki-bot/Dockerfile b/wiki-bot/Dockerfile
index 28c8674..b1a072b 100644
--- a/wiki-bot/Dockerfile
+++ b/wiki-bot/Dockerfile
@@ -1,26 +1,26 @@
-FROM java:latest
+FROM java:8-alpine
 MAINTAINER Mike Shemanskiy <mike.shemanskiy@gmail.com>
 
-RUN mkdir bot
-ADD src /bot/src
-ADD pom.xml /bot
-
-RUN wget http://ftp.fau.de/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-RUN tar -zxvf apache-maven-3.3.9-bin.tar.gz
-RUN rm apache-maven-3.3.9-bin.tar.gz
-RUN mv apache-maven-3.3.9 /usr/lib/mvn
-
 ENV M2_HOME=/usr/lib/mvn
 ENV M2=$M2_HOME/bin
 ENV PATH $PATH:$JAVA_HOME:$JAVA:$M2_HOME:$M2
 
-RUN cd /bot \
-    && mvn package \
-    && mv target/rtbot-0.0.1-SNAPSHOT.jar . \
-    && rm -r target src pom.xml /usr/lib/mvn
+ADD http://ftp.fau.de/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz /tmp/
 
+RUN cd /tmp/ && \
+    tar -zxvf apache-maven-3.3.9-bin.tar.gz && \
+    rm apache-maven-3.3.9-bin.tar.gz && \
+    mv apache-maven-3.3.9 /usr/lib/mvn && \
+    rm -rf /tmp/* && \
+    mkdir -p /bot
+
+ADD . /src
 WORKDIR /bot
 
+RUN cd /src/ && mvn -q package \
+    && mv target/rtbot-0.0.1-SNAPSHOT.jar /bot \
+    && rm -rf /src /usr/lib/mvn /tmp/*
+
 EXPOSE 8080
 
-CMD ["java", "-jar", "rtbot-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "rtbot-0.0.1-SNAPSHOT.jar"]