diff --git a/common.docker b/common.docker
index 77e153e..009aade 100644
--- a/common.docker
+++ b/common.docker
@@ -1,6 +1,6 @@
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
 
-RUN apt-get update && apt-get install -y apt-utils cmake wget git make
+RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkgconfig lhasa 
 RUN echo "root:root" | chpasswd
 
 ENV CROSS_ROOT /opt/${CROSS_PFX}
@@ -24,4 +24,5 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
 	
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
-ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr 
\ No newline at end of file
+ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
\ No newline at end of file
diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 4737b95..fc2d1fd 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -1,14 +1,16 @@
-FROM sebastianbergmann/amiga-gcc:latest
+FROM ubuntu:19.04
 
 ENV CROSS_PFX m68k-amigaos
 
 # Temporary fix
+COPY --from=sebastianbergmann/amiga-gcc:latest /opt/amiga ./opt/amiga
 RUN ln -s /opt/amiga /opt/${CROSS_PFX}
 
+
 # START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
 
-RUN apt-get update && apt-get install -y apt-utils cmake wget git make
+RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkgconfig lhasa 
 RUN echo "root:root" | chpasswd
 
 ENV CROSS_ROOT /opt/${CROSS_PFX}