diff --git a/Dockerfile b/Dockerfile
index fe65e1e..ac1b8b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,18 @@
 FROM wiiulegacy/core:0.1
 
-RUN rm -rf $DEVKITPRO/portlibs
-COPY --from=wiiulegacy/dynamic_libs:0.1 $DEVKITPRO/portlibs $DEVKITPRO/portlibs
+MAINTAINER Maschell <maschell@gmx.de>
+
+COPY --from=wiiulegacy/dynamic_libs:0.1 /artifacts $DEVKITPRO/portlibs
+
+RUN git clone https://github.com/Maschell/libutils -b master && cd libutils && git checkout v0.1
 
-RUN git clone https://github.com/Maschell/libutils -b master
 WORKDIR libutils
-RUN git checkout v0.1
 
-RUN make && make install
+RUN make && \
+	rm -rf $DEVKITPRO/portlibs && \
+	mkdir -p $DEVKITPRO/portlibs/ppc/lib && \
+	mkdir -p $DEVKITPRO/portlibs/ppc/include && \
+	make install && \
+	cp -r ${DEVKITPRO}/portlibs /artifacts
 
-WORKDIR ..
-RUN rm -rf libutils
\ No newline at end of file
+WORKDIR /artifacts
\ No newline at end of file