diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index 9475631..4d091c2 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -49,15 +49,16 @@ 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
 
-RUN mv ./* /build/dist/
 
-ENV JAVA_HOME=/build/dist/jre
+
+ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
 ENV PATH="$JAVA_HOME/bin:$PATH"
 
 WORKDIR /build/src
 RUN make test TEST=tier1 JOBS=$(nproc)
 
-
+WORKDIR /build/src/build/linux-x86_64-server-release/images
+RUN mv ./* /build/dist/
 
 
 # ------