diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..616af73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_size = 2
diff --git a/Dockerfile b/Dockerfile
index ab0ed91..26a0b17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,20 @@
-FROM quay.io/thallian/confd-env:latest
+FROM alpine:latest as builder
 
-RUN apk add --no-cache openjdk8 git libressl bash
+RUN apk --no-cache add libressl git openjdk8
+
+RUN wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" && \
+    java -jar BuildTools.jar
+
+FROM registry.gitlab.com/thallian/docker-confd-env:master
+
+COPY --from=builder /spigot*.jar /var/lib/minecraft/spigot.jar
+COPY --from=builder /craftbukkit*.jar /var/lib/minecraft/craftbukkit.jar
+
+RUN apk add --no-cache openjdk8 libressl
 
 RUN addgroup minecraft
 RUN adduser -h /var/lib/minecraft -D -G minecraft minecraft
 
-RUN mkdir /tmp/minecraft/ && \
-    wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" -O /tmp/minecraft/BuildTools.jar && \
-    cd /tmp/minecraft && bash -c 'java -jar BuildTools.jar' && \
-    cp /tmp/minecraft/spigot*.jar /var/lib/minecraft/spigot.jar && \
-    cp /tmp/minecraft/craftbukkit*.jar /var/lib/minecraft/craftbukkit.jar && \
-    rm -r /tmp/minecraft && \
-    apk del git bash
-
 RUN mkdir -p /etc/services.d/minecraft/
 
 ADD /rootfs /
@@ -21,4 +23,4 @@ RUN chown -R minecraft:minecraft /var/lib/minecraft
 
 VOLUME /var/lib/minecraft/world /var/lib/minecraft/world_nether /var/lib/minecraft/world_the_end /var/lib/minecraft/plugins
 
-EXPOSE 25565
\ No newline at end of file
+EXPOSE 25565