diff --git a/Dockerfile b/Dockerfile
index e8e678f..03b989a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,8 @@
 FROM gentoo/stage3-amd64-hardened as base
 
-RUN mkdir /usr/portage && emerge-webrsync
-
-RUN mkdir /tmp/root && emerge -q --root=/tmp/root dev-util/catalyst
-
-FROM gentoo/stage3-amd64-hardened
-
-# Copy needed files
-COPY --from=base /tmp/root/* /
-
-#COPY --from=base /etc /etc
-#COPY --from=base /usr/bin /usr/bin
-#COPY --from=base /usr/include /usr/include
-#COPY --from=base /usr/lib /usr/lib
-#COPY --from=base /usr/lib64 /usr/lib64
-#COPY --from=base /usr/share /usr/share
+RUN mkdir /usr/portage && emerge-webrsync \
+  && emerge -q dev-util/catalyst \
+  && rm -Rf /var/tmp/portage /usr/portage
 
 # Volume for catalyst generated files
 VOLUME /var/lib/catalyst