diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2e4092f..40d9429 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -62,7 +62,7 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 ENV Z88DK_PATH="/opt/z88dk"
 RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
-	&& git clone --depth 1 --branch v2.3 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
+	&& git clone --depth 1 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
 	&& cd ${Z88DK_PATH} \ 
 	&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
 	&& chmod 777 build.sh \
@@ -75,6 +75,7 @@ RUN apt-get update \
 	ca-certificates \
 	fuse-emulator-utils \
 	git \
+	m4 \
 	make \
 	openssh-client \
 	pasmo \
@@ -95,9 +96,7 @@ COPY --from=build /zxbasic/tools /opt/zxbasic/tools
 COPY --from=build /inpaws/inpaws /bin/inpaws
 COPY --from=build /usr/local/bin/ /usr/local/bin/
 COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/
-COPY --from=z88dk /opt/z88dk/bin /opt/z88dk/bin
-COPY --from=z88dk /opt/z88dk/lib /opt/z88dk/lib
-COPY --from=z88dk /opt/z88dk/include /opt/z88dk/include
+COPY --from=z88dk /opt/z88dk/ /opt/z88dk/
 ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools"
 ENV ZCCCFG="/opt/z88dk/lib/config"
 USER ubuntu