diff --git a/scripts/release/build_all.sh b/scripts/release/build_all.sh
index 19fbaec..f86f097 100755
--- a/scripts/release/build_all.sh
+++ b/scripts/release/build_all.sh
@@ -17,18 +17,6 @@ if [ $? -ne 0 ]; then
 	images/ubuntu/build.sh
 fi
 
-rm -f p2pool.tar
-tar -f p2pool.tar -c ../cmake -c ../external -c ../patches -c ../src -c ../CMakeLists.txt -c ../LICENSE -c ../README.md
-
-ln p2pool.tar freebsd_aarch64/p2pool.tar
-ln p2pool.tar freebsd_x64/p2pool.tar
-ln p2pool.tar linux_aarch64/p2pool.tar
-ln p2pool.tar linux_riscv64/p2pool.tar
-ln p2pool.tar linux_x64/p2pool.tar
-ln p2pool.tar windows_x64/p2pool.tar
-ln p2pool.tar macos_aarch64/p2pool.tar
-ln p2pool.tar macos_x64/p2pool.tar
-
 gnome-terminal --tab -- freebsd_aarch64/build.sh $1
 gnome-terminal --tab -- freebsd_x64/build.sh $1
 gnome-terminal --tab -- linux_aarch64/build.sh $1
diff --git a/scripts/release/freebsd_aarch64/Dockerfile b/scripts/release/freebsd_aarch64/Dockerfile
index d8feff3..a7585e7 100644
--- a/scripts/release/freebsd_aarch64/Dockerfile
+++ b/scripts/release/freebsd_aarch64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_freebsd_aarch64.sh /p2pool/
-RUN /p2pool/p2pool_freebsd_aarch64.sh p2pool-${P2POOL_VERSION}-freebsd-aarch64 ${BUILD_TIMESTAMP}
+ADD p2pool_freebsd_aarch64.sh /p2pool/
+RUN /p2pool/p2pool_freebsd_aarch64.sh p2pool-${P2POOL_VERSION}-freebsd-aarch64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/freebsd_aarch64/build.sh b/scripts/release/freebsd_aarch64/build.sh
index 09de92a..b57b6c2 100755
--- a/scripts/release/freebsd_aarch64/build.sh
+++ b/scripts/release/freebsd_aarch64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_freebsd_aarch64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_freebsd_aarch64_build_container:/p2pool/build/p2pool-$1-freebsd
 docker rm p2pool_freebsd_aarch64_build_container
 
 docker image rm -f p2pool_freebsd_aarch64_build
-
-rm p2pool.tar
diff --git a/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh b/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh
index 7d159de..9f23031 100755
--- a/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh
+++ b/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/freebsd_x64/Dockerfile b/scripts/release/freebsd_x64/Dockerfile
index 3ab2644..d4d2a1a 100644
--- a/scripts/release/freebsd_x64/Dockerfile
+++ b/scripts/release/freebsd_x64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_freebsd_x64.sh /p2pool/
-RUN /p2pool/p2pool_freebsd_x64.sh p2pool-${P2POOL_VERSION}-freebsd-x64 ${BUILD_TIMESTAMP}
+ADD p2pool_freebsd_x64.sh /p2pool/
+RUN /p2pool/p2pool_freebsd_x64.sh p2pool-${P2POOL_VERSION}-freebsd-x64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/freebsd_x64/build.sh b/scripts/release/freebsd_x64/build.sh
index 5cc3068..86986af 100755
--- a/scripts/release/freebsd_x64/build.sh
+++ b/scripts/release/freebsd_x64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_freebsd_x64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_freebsd_x64_build_container:/p2pool/build/p2pool-$1-freebsd-x64
 docker rm p2pool_freebsd_x64_build_container
 
 docker image rm -f p2pool_freebsd_x64_build
-
-rm p2pool.tar
diff --git a/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh b/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh
index 1d04d96..f69a007 100755
--- a/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh
+++ b/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/images/ubuntu/prepare.sh b/scripts/release/images/ubuntu/prepare.sh
index 65061f2..593c6d5 100755
--- a/scripts/release/images/ubuntu/prepare.sh
+++ b/scripts/release/images/ubuntu/prepare.sh
@@ -439,4 +439,9 @@ echo "Deleting temporary files"
 cd /root
 rm -rf *
 
+echo "Cloning the repository"
+
+cd /
+git clone --recursive --jobs $(nproc) https://github.com/SChernykh/p2pool
+
 echo "All done"
diff --git a/scripts/release/linux_aarch64/Dockerfile b/scripts/release/linux_aarch64/Dockerfile
index 6b91d5a..519324a 100644
--- a/scripts/release/linux_aarch64/Dockerfile
+++ b/scripts/release/linux_aarch64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_linux_aarch64.sh /p2pool/
-RUN /p2pool/p2pool_linux_aarch64.sh p2pool-${P2POOL_VERSION}-linux-aarch64 ${BUILD_TIMESTAMP}
+ADD p2pool_linux_aarch64.sh /p2pool/
+RUN /p2pool/p2pool_linux_aarch64.sh p2pool-${P2POOL_VERSION}-linux-aarch64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/linux_aarch64/build.sh b/scripts/release/linux_aarch64/build.sh
index 392f73b..02df0bb 100755
--- a/scripts/release/linux_aarch64/build.sh
+++ b/scripts/release/linux_aarch64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_ubuntu_aarch64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_ubuntu_aarch64_build_container:/p2pool/build/p2pool-$1-linux-aa
 docker rm p2pool_ubuntu_aarch64_build_container
 
 docker image rm -f p2pool_ubuntu_aarch64_build
-
-rm p2pool.tar
diff --git a/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh b/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh
index 5c5cdf0..5d423a0 100755
--- a/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh
+++ b/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/linux_riscv64/Dockerfile b/scripts/release/linux_riscv64/Dockerfile
index 3f7e45a..6bf5566 100644
--- a/scripts/release/linux_riscv64/Dockerfile
+++ b/scripts/release/linux_riscv64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_linux_riscv64.sh /p2pool/
-RUN /p2pool/p2pool_linux_riscv64.sh p2pool-${P2POOL_VERSION}-linux-riscv64 ${BUILD_TIMESTAMP}
+ADD p2pool_linux_riscv64.sh /p2pool/
+RUN /p2pool/p2pool_linux_riscv64.sh p2pool-${P2POOL_VERSION}-linux-riscv64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/linux_riscv64/build.sh b/scripts/release/linux_riscv64/build.sh
index f45d39e..4624d0b 100755
--- a/scripts/release/linux_riscv64/build.sh
+++ b/scripts/release/linux_riscv64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_ubuntu_riscv64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_ubuntu_riscv64_build_container:/p2pool/build/p2pool-$1-linux-ri
 docker rm p2pool_ubuntu_riscv64_build_container
 
 docker image rm -f p2pool_ubuntu_riscv64_build
-
-rm p2pool.tar
diff --git a/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh b/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh
index c543bac..a08e30f 100755
--- a/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh
+++ b/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/linux_x64/Dockerfile b/scripts/release/linux_x64/Dockerfile
index 432df51..894be8b 100644
--- a/scripts/release/linux_x64/Dockerfile
+++ b/scripts/release/linux_x64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_linux_x64.sh /p2pool/
-RUN /p2pool/p2pool_linux_x64.sh p2pool-${P2POOL_VERSION}-linux-x64 ${BUILD_TIMESTAMP}
+ADD p2pool_linux_x64.sh /p2pool/
+RUN /p2pool/p2pool_linux_x64.sh p2pool-${P2POOL_VERSION}-linux-x64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/linux_x64/build.sh b/scripts/release/linux_x64/build.sh
index 3b93df0..aa40f14 100755
--- a/scripts/release/linux_x64/build.sh
+++ b/scripts/release/linux_x64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_linux_x64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_linux_x64_build_container:/p2pool/build/p2pool-$1-linux-x64.tar
 docker rm p2pool_linux_x64_build_container
 
 docker image rm -f p2pool_linux_x64_build
-
-rm p2pool.tar
diff --git a/scripts/release/linux_x64/p2pool_linux_x64.sh b/scripts/release/linux_x64/p2pool_linux_x64.sh
index 0f291a0..0498d75 100755
--- a/scripts/release/linux_x64/p2pool_linux_x64.sh
+++ b/scripts/release/linux_x64/p2pool_linux_x64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/macos_aarch64/Dockerfile b/scripts/release/macos_aarch64/Dockerfile
index 22f300e..6f74ad1 100644
--- a/scripts/release/macos_aarch64/Dockerfile
+++ b/scripts/release/macos_aarch64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_macos_aarch64.sh zutil.patch /p2pool/
-RUN /p2pool/p2pool_macos_aarch64.sh p2pool-${P2POOL_VERSION}-macos-aarch64 ${BUILD_TIMESTAMP}
+ADD p2pool_macos_aarch64.sh zutil.patch /p2pool/
+RUN /p2pool/p2pool_macos_aarch64.sh p2pool-${P2POOL_VERSION}-macos-aarch64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/macos_aarch64/build.sh b/scripts/release/macos_aarch64/build.sh
index 3d4ce0f..4cadc5c 100755
--- a/scripts/release/macos_aarch64/build.sh
+++ b/scripts/release/macos_aarch64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_macos_aarch64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_macos_aarch64_build_container:/p2pool/build/p2pool-$1-macos-aar
 docker rm p2pool_macos_aarch64_build_container
 
 docker image rm -f p2pool_macos_aarch64_build
-
-rm p2pool.tar
diff --git a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh
index 940874d..2f4fd63 100755
--- a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh
+++ b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/macos_x64/Dockerfile b/scripts/release/macos_x64/Dockerfile
index 305c172..4b68748 100644
--- a/scripts/release/macos_x64/Dockerfile
+++ b/scripts/release/macos_x64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_macos_x64.sh zutil.patch /p2pool/
-RUN /p2pool/p2pool_macos_x64.sh p2pool-${P2POOL_VERSION}-macos-x64 ${BUILD_TIMESTAMP}
+ADD p2pool_macos_x64.sh zutil.patch /p2pool/
+RUN /p2pool/p2pool_macos_x64.sh p2pool-${P2POOL_VERSION}-macos-x64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/macos_x64/build.sh b/scripts/release/macos_x64/build.sh
index 5f221a4..01f5c26 100755
--- a/scripts/release/macos_x64/build.sh
+++ b/scripts/release/macos_x64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_macos_x64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_macos_x64_build_container:/p2pool/build/p2pool-$1-macos-x64.tar
 docker rm p2pool_macos_x64_build_container
 
 docker image rm -f p2pool_macos_x64_build
-
-rm p2pool.tar
diff --git a/scripts/release/macos_x64/p2pool_macos_x64.sh b/scripts/release/macos_x64/p2pool_macos_x64.sh
index ee61f05..b88c63c 100755
--- a/scripts/release/macos_x64/p2pool_macos_x64.sh
+++ b/scripts/release/macos_x64/p2pool_macos_x64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
diff --git a/scripts/release/source/build.sh b/scripts/release/source/build.sh
index 8afcef6..d7cfe20 100755
--- a/scripts/release/source/build.sh
+++ b/scripts/release/source/build.sh
@@ -7,7 +7,7 @@ cd "$(dirname "$0")"
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_source_build .
 
 docker create --name p2pool_source_build_container p2pool_source_build:latest
-docker cp p2pool_source_build_container:/root/p2pool_source-$1.tar.xz ../p2pool_source-$1.tar.xz
+docker cp p2pool_source_build_container:/p2pool_source-$1.tar.xz ../p2pool_source-$1.tar.xz
 docker rm p2pool_source_build_container
 
 docker image rm -f p2pool_source_build
diff --git a/scripts/release/source/p2pool_source.sh b/scripts/release/source/p2pool_source.sh
index 65fedbe..cf2ecc1 100755
--- a/scripts/release/source/p2pool_source.sh
+++ b/scripts/release/source/p2pool_source.sh
@@ -1,17 +1,20 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $1
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
 CURRENT_TIME=$(date -u -d @$2 +"%H:%M:%S")
 TOUCH_DATE=$(date -u -d @$2 +"%Y%m%d%H%M.%S")
 
-cd /root
+cd /
 
-git clone --depth=1 --recursive --branch $1 https://github.com/SChernykh/p2pool
-
-tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" --exclude=".git" --exclude="release_scripts/*.tar*" -f p2pool_source-$1.tar -c p2pool
+tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" --exclude=".git" -f p2pool_source-$1.tar -c p2pool
 touch -t $TOUCH_DATE p2pool_source-$1.tar
 
 xz --version
diff --git a/scripts/release/windows_x64/Dockerfile b/scripts/release/windows_x64/Dockerfile
index 8773ac7..df6e053 100644
--- a/scripts/release/windows_x64/Dockerfile
+++ b/scripts/release/windows_x64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_windows_x64.sh /p2pool/
-RUN /p2pool/p2pool_windows_x64.sh p2pool-${P2POOL_VERSION}-windows-x64 ${BUILD_TIMESTAMP}
+ADD p2pool_windows_x64.sh /p2pool/
+RUN /p2pool/p2pool_windows_x64.sh p2pool-${P2POOL_VERSION}-windows-x64 ${BUILD_TIMESTAMP} ${P2POOL_VERSION}
diff --git a/scripts/release/windows_x64/build.sh b/scripts/release/windows_x64/build.sh
index 296eb44..a3ce9d0 100755
--- a/scripts/release/windows_x64/build.sh
+++ b/scripts/release/windows_x64/build.sh
@@ -3,7 +3,6 @@
 # Example usage: ./build.sh v4.8.1
 
 cd "$(dirname "$0")"
-[ ! -f "p2pool.tar" ] && tar -f p2pool.tar -c ../../cmake -c ../../external -c ../../patches -c ../../src -c ../../CMakeLists.txt -c ../../LICENSE -c ../../README.md
 
 docker build --build-arg P2POOL_VERSION=$1 --build-arg BUILD_TIMESTAMP="$(git show --no-patch --format=%ct $1)" -t p2pool_windows_x64_build .
 
@@ -12,5 +11,3 @@ docker cp p2pool_windows_x64_build_container:/p2pool/build/p2pool-$1-windows-x64
 docker rm p2pool_windows_x64_build_container
 
 docker image rm -f p2pool_windows_x64_build
-
-rm p2pool.tar
diff --git a/scripts/release/windows_x64/p2pool_windows_x64.sh b/scripts/release/windows_x64/p2pool_windows_x64.sh
index 5d4760c..41f8511 100755
--- a/scripts/release/windows_x64/p2pool_windows_x64.sh
+++ b/scripts/release/windows_x64/p2pool_windows_x64.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
 export TZ=UTC0
 
 CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")