diff --git a/docker/organic_test/Dockerfile b/docker/organic_test/Dockerfile
index 814ffe0..a6da39c 100644
--- a/docker/organic_test/Dockerfile
+++ b/docker/organic_test/Dockerfile
@@ -19,7 +19,17 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
 FROM build AS build-emacs
 ARG EMACS_REPO
 ARG EMACS_VERSION
-ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
+
+RUN <<EOF
+set -euo pipefail
+IFS=$'\n\t'
+mkdir -p /root/emacs
+git -C /root/emacs init --initial-branch=main
+git -C /root/emacs remote add origin $EMACS_REPO
+git -C /root/emacs fetch origin $EMACS_VERSION
+git -C /root/emacs checkout FETCH_HEAD
+EOF
+#ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
 WORKDIR /root/emacs
 RUN <<EOF
 mkdir /root/dist