diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index ae66ec9..c39ea85 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -50,27 +50,24 @@ jdk.nio.mapmode,jdk.random,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsu
 jdk.xml.dom,jdk.zipfs,openj9.criu,openj9.cuda,openj9.dataaccess,openj9.gpu,openj9.jvm,\
 openj9.sharedclasses,openj9.zosconditionhandling
 
-
-
 ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
 ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
 ENV TEST_JDK_HOME=/build/src/build/linux-x86_64-server-release/images/jdk
 ENV TEST_ROOT=/build/openj9-repo/test
 ENV DIAGNOSTICLEVEL=nodetails
 
-RUN git clone --depth=1 https://github.com/eclipse-openj9/openj9.git /build/openj9-repo
+WORKDIR /build/openj9-repo/test
+RUN git clone --single-branch --depth=1 https://github.com/eclipse-openj9/openj9.git .
+RUN git clone https://github.com/adoptium/TKG.git
 
-RUN cd /build/openj9-repo/test \
-     && git clone https://github.com/adoptium/TKG.git \
-     && cd TKG \
-     && make compile -j$(nproc) \
-     && make _sanity.openjdk.regular -j$(nproc)
+WORKDIR TKG
 
+RUN make compile -j$(nproc)
+RUN make _all
 
 WORKDIR /build/src/build/linux-x86_64-server-release/images
 RUN mv ./* /build/dist/
 
-
 # ------
 
 FROM ubuntu:25.04 AS run