diff --git a/hoisted/Dockerfile b/hoisted/Dockerfile
index 9c55a78..ccce707 100644
--- a/hoisted/Dockerfile
+++ b/hoisted/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8
+FROM openjdk:8 AS base
 
 RUN apt update && apt upgrade -y && \
     apt install -y apt-transport-https
@@ -10,11 +10,34 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B
 RUN apt update && \
     apt install -y git sbt
 
-RUN cd ~ && git clone https://github.com/hoisted/hoisted.git && \
-    cd hoisted && git checkout tags/v0.4.2 && sbt assembly && \
+RUN mkdir hoisted
+
+COPY hoisted/build.sbt hoisted/
+
+RUN mkdir hoisted/project
+
+COPY hoisted/project hoisted/project
+
+WORKDIR hoisted
+
+RUN sbt assembly
+
+WORKDIR /
+
+COPY hoisted hoisted
+
+WORKDIR hoisted
+
+RUN sbt assembly && \
     cp target/scala-2.12/hoisted.jar /usr/local/lib/hoisted.jar &&\
     cd ~ && rm -rf hoisted .ivy2 .sbt
 
 COPY ./entrypoint.sh /usr/bin/entrypoint.sh
+
+FROM openjdk:alpine
+
+COPY --from=base /usr/local/lib/hoisted.jar /usr/local/lib/hoisted.jar
+COPY --from=base /usr/bin/entrypoint.sh /usr/bin/entrypoint.sh
+
 RUN chmod +x /usr/bin/entrypoint.sh
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
diff --git a/hoisted/build.sh b/hoisted/build.sh
index 4404c0c..2b2ef2e 100755
--- a/hoisted/build.sh
+++ b/hoisted/build.sh
@@ -4,4 +4,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 cd ${DIR}
 
-docker build -t opentelegram/hoisted:latest -f Dockerfile .
+git clone https://github.com/hoisted/hoisted.git
+
+docker build -t shadowfiend/hoisted:latest -f Dockerfile .
+
+rm -rf hoisted/