diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 77c57c7c..3f9fad2b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -33,8 +33,7 @@ jobs:
         run: |
             docker buildx version
             tag=osb/osb-`echo ${{ matrix.platform }} | tr '/' '-'`
-            tar zcf /tmp/osb.tgz .
-            mv /tmp/osb.tgz .
+            (cd ..; tar zcf osb.tgz opensearch-benchmark)
             set -x
             docker buildx build --platform ${{ matrix.platform }} --build-arg VERSION=`cat version.txt` --build-arg BUILD_DATE=`date -u +%Y-%m-%dT%H:%M:%SZ` -f docker/Dockerfile -t "$tag" -o type=docker .
             set +x
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ccb2c6d5..61556384 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,8 +14,8 @@ RUN apt-get -y update && \
 RUN groupadd --gid 1000 opensearch-benchmark && \
     useradd -d /opensearch-benchmark -m -k /dev/null -g 1000 -N -u 1000 -l -s /bin/bash benchmark
 
-COPY osb.tgz .
-RUN set -e; tar zxf osb.tgz; make install; cd ..; rm -rf opensearch-benchmark
+COPY ../osb.tgz .
+RUN set -e; tar zxf osb.tgz; cd opensearch-benchmark; make install; cd ..; rm -rf osb.tgz opensearch-benchmark
 
 RUN mkdir -p /opensearch-benchmark/.benchmark && \
     chown -R 1000:0 /opensearch-benchmark/.benchmark