diff --git a/common.docker b/common.docker
index c237a31..0cf3d60 100644
--- a/common.docker
+++ b/common.docker
@@ -3,10 +3,9 @@ MAINTAINER Marlon Beijer "marlon@amigadev.com"
 RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkg-config lhasa 
 RUN echo "root:root" | chpasswd
 
-ENV CROSS_ROOT /opt/${CROSS_PFX}
+RUN ln -s /opt/${CROSS_PFX} /tools
 
-# Temporary fix
-RUN rm /opt/${CROSS_PFX} ; ln -s /opt/amiga /opt/${CROSS_PFX}
+ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 WORKDIR /work
 ENTRYPOINT ["/entry/entrypoint.sh"]
diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 3c7328d..2ae7951 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -13,10 +13,9 @@ MAINTAINER Marlon Beijer "marlon@amigadev.com"
 RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkg-config lhasa 
 RUN echo "root:root" | chpasswd
 
-ENV CROSS_ROOT /opt/${CROSS_PFX}
+RUN ln -s /opt/${CROSS_PFX} /tools
 
-# Temporary fix
-RUN rm /opt/${CROSS_PFX} ; ln -s /opt/amiga /opt/${CROSS_PFX}
+ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 WORKDIR /work
 ENTRYPOINT ["/entry/entrypoint.sh"]