diff --git a/Dockerfile b/Dockerfile
index 09456c3..38ff8d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM alpine:latest AS builder
+FROM archlinux:latest AS builder
 
-RUN apk add go git gcc binutils bash
+RUN pacman -Sy
+RUN pacman -S go git gcc binutils bash --noconfirm
 
 WORKDIR /tmp
 RUN git clone https://git.towk2.me/towk/makeshift.git
@@ -9,19 +10,20 @@ WORKDIR /tmp/makeshift
 
 RUN go mod tidy && \
     go build && \
-    mkdir tmp && \
-    ./makeshift plugins compile ./pkg/plugins/jinja2/jinja2.go -o ./tmp/plugins/jinja.so
+    mkdir -p /makeshift
+RUN ./makeshift init /makeshift
+RUN ./makeshift plugins compile ./pkg/plugins/jinja2/jinja2.go -o ./tmp/plugins/jinja.so
 
 
 FROM alpine:latest
 
 
 COPY --from=builder /tmp/makeshift/makeshift /usr/local/bin
-COPY --from=builder /tmp/makeshift/tmp/plugins/* /makeshift/server/plugins/
+COPY --from=builder /tmp/makeshift/tmp/plugins/* /makeshift/plugins/
 
 RUN chmod +x /usr/local/bin/makeshift
 
 RUN mkdir -p /makeshift/logs && \
     touch /makeshift/logs/makeshift.log
 
-ENTRYPOINT ["/usr/local/bin/makeshift"]
\ No newline at end of file
+ENTRYPOINT ["/usr/local/bin/makeshift"]