diff --git a/.dockerignore b/.dockerignore
new file mode 120000
index 000000000..3e4e48b0b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+.gitignore
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 147edd8a8..d33f0a510 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,19 @@
-FROM mozilla/sbt:8u232_1.3.8
-
-EXPOSE 51000
-EXPOSE 51001
-EXPOSE 51002
+FROM mozilla/sbt:8u232_1.3.8 as builder
 
 COPY . /PSF-LoginServer
 
 WORKDIR /PSF-LoginServer
 
 RUN wget https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip && \
-    unzip pscrypto-lib-1.1.zip && rm pscrypto-lib-1.1.zip
+    unzip pscrypto-lib-1.1.zip && rm pscrypto-lib-1.1.zip && \
+    sbt pack
 
-RUN sbt compile
+FROM openjdk:8u252-slim
 
-CMD ["sbt", "pslogin/run"]
+COPY --from=builder /PSF-LoginServer/target/pack/ /usr/local
+
+EXPOSE 51000
+EXPOSE 51001
+EXPOSE 51002
+
+CMD ["ps-login"]