diff --git a/python/Dockerfile b/python/Dockerfile
index c10788e0e..e4af99154 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -3,16 +3,19 @@
 # sudo docker build -t manylinux2014_opm:built . -f python/Dockerfile
 
 FROM quay.io/pypa/manylinux_2_28_x86_64 AS stage1
-ARG version_tag=""
+ARG version="master"
 ARG build_jobs=4
+ARG version_tag=""
 WORKDIR /tmp/opm
+RUN echo "Using version: $version"
 RUN echo "Using package version tag: $version_tag"
+RUN echo "Number of build jobs: $build_jobs"
 ADD . .
 RUN /bin/bash setup-docker-image.sh
 FROM stage1 AS stage2
 RUN /bin/bash build-deps.sh $build_jobs
 FROM stage2 AS stage3
-RUN /bin/bash generate-pypi-package.sh $version_tag $build_jobs
+RUN /bin/bash generate-pypi-package.sh "$version" "$build_jobs" "$version_tag"
 
 FROM scratch AS export_stage
 COPY --from=stage3 /tmp/opm/wheelhouse .
diff --git a/python/generate-pypi-package.sh b/python/generate-pypi-package.sh
index 5a6d4e9fe..aa6263a5b 100755
--- a/python/generate-pypi-package.sh
+++ b/python/generate-pypi-package.sh
@@ -2,8 +2,9 @@
 
 set -e
 
-VERSION_TAG=${1:-""}
-BUILD_JOBS=$2
+VERSION=${1:-"master"}
+BUILD_JOBS=${2:-16}
+VERSION_TAG=${3:-""}
 
 export CMAKE_GENERATOR=Ninja
 
@@ -25,9 +26,9 @@ done
 DIR=`pwd`
 
 # Setup opm modules
-git clone https://github.com/OPM/opm-common
-git clone https://github.com/OPM/opm-grid
-git clone https://github.com/OPM/opm-simulators
+git clone https://github.com/OPM/opm-common -b $VERSION
+git clone https://github.com/OPM/opm-grid -b $VERSION
+git clone https://github.com/OPM/opm-simulators -b $VERSION
 git clone https://github.com/OPM/opm-utilities
 
 ln -sf opm-utilities/opm-super/CMakeLists.txt CMakeLists.txt