diff --git a/Dockerfile.multistage b/Dockerfile.multistage
index ac2b731..a39ffcd 100644
--- a/Dockerfile.multistage
+++ b/Dockerfile.multistage
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:focal AS builder
 
 # needed to install tzdata
 ARG DEBIAN_FRONTEND=noninteractive
@@ -37,7 +37,6 @@ WORKDIR /root/mumble
 RUN git submodule update --init --recursive
 WORKDIR /root/mumble/build
 
-RUN git submodule update --init --recursive
 RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
     ( cat \
     /root/mumble/build/CMakeFiles/CMakeOutput.log \
@@ -45,8 +44,6 @@ RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
     && false \
     )
 RUN make -j $(nproc)
-RUN ls
-RUN cat /root/mumble/build/mumble-server.ini
 
 # Clean distribution stage
 FROM ubuntu:focal
@@ -73,8 +70,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY --from=0 /root/mumble/build/mumble-server /usr/bin/mumble-server
-COPY --from=0 /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
+COPY --from=builder /root/mumble/build/mumble-server /usr/bin/mumble-server
+#COPY --from=builder /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
+COPY --from=builder /root/mumble/build /etc/murmur/
 
 RUN mkdir /var/lib/murmur && \
 	chown --verbose murmur:murmur /var/lib/murmur && \