diff --git a/Dockerfile b/Dockerfile
index a70e83c..6942568 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -99,17 +99,17 @@ RUN set -eux ; \
 
 #byteman test for development
 ARG BYTEMAN_VERSION=4.0.25
-ARG BYTEMAN_LIB=/opt/byteman/lib
-RUN curl -L -o /tmp/byteman.zip https://downloads.jboss.org/byteman/${BYTEMAN_VERSION}/byteman-download-${BYTEMAN_VERSION}-bin.zip && \
-    unzip /tmp/byteman.zip -d /tmp && \
-    sudo mkdir -p ${BYTEMAN_LIB} && \
-    sudo cp /tmp/byteman-download-${BYTEMAN_VERSION}/lib/byteman.jar ${BYTEMAN_LIB}/byteman.jar && \
-    sudo cp /tmp/byteman-download-${BYTEMAN_VERSION}/lib/byteman-submit.jar ${BYTEMAN_LIB}/byteman-submit.jar && \
-    sudo cp /tmp/byteman-download-${BYTEMAN_VERSION}/bin/bmsubmit.sh /usr/local/bin/bmsubmit && \
+ENV BYTEMAN_HOME=/opt/byteman
+RUN cd /tmp && \
+    curl -L -o byteman.zip https://downloads.jboss.org/byteman/${BYTEMAN_VERSION}/byteman-download-${BYTEMAN_VERSION}-bin.zip && \
+    unzip -j -d byteman byteman.zip && \
+    sudo mkdir -p ${BYTEMAN_HOME}/lib && \
+    sudo mv byteman/byteman.jar byteman/byteman-submit.jar ${BYTEMAN_HOME}/lib/ && \
+    sudo mv byteman/bmsubmit.sh /usr/local/bin/bmsubmit && \
     sudo chmod +x /usr/local/bin/bmsubmit && \
-    sudo rm -rf /tmp/byteman.zip /tmp/byteman-download-${BYTEMAN_VERSION} && \
-    sudo chmod o+r ${BYTEMAN_LIB}/byteman.jar && \
-    sudo ln -s ${BYTEMAN_LIB}/byteman.jar /opt/byteman.jar
+    sudo rm -rf byteman.zip byteman && \
+    sudo chmod -R a+rX ${BYTEMAN_HOME} && \
+    sudo ln -s ${BYTEMAN_HOME}/lib/byteman.jar /opt/byteman.jar
 
 #async profiler for development profiling
 RUN set -eux ; \