diff --git a/Dockerfile b/Dockerfile
index fde9b2e..e7cfcca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,12 +27,10 @@ RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
 ARG OPENGNSYS_HEAD
 
-COPY ./og_client_engine /tmp/opengnsys/engine
-COPY ./og_client_shared /tmp/opengnsys/shared
-COPY ./gitrelease       /tmp/opengnsys/
-COPY *.deb boottools includes chroot-tasks.py mkoglive.cfg mkoglive.py mount-defaults schroot.conf /tmp/opengnsys/oglive_builder/
+COPY . /tmp/opengnsys/oglive_builder/
 
-RUN ls -la /tmp/opengnsys/ /tmp/opengnsys/engine/ /tmp/opengnsys/shared/ /tmp/opengnsys/oglive_builder/ && \
+RUN ls -la /tmp/opengnsys/oglive_builder/ && \
+    mv /tmp/opengnsys/oglive_builder/client /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/ && \
     cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \
     rm -f /etc/schroot/setup.d/*chrootname