diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh
index 25ac64f4846ec..be655439fa325 100755
--- a/pulsar-client-cpp/docker/build-wheels.sh
+++ b/pulsar-client-cpp/docker/build-wheels.sh
@@ -27,6 +27,18 @@ BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
 ROOT_DIR=`cd $(dirname $0)/../..; pwd`
 cd $ROOT_DIR
 
+skip_create_images=0
+while [[ "$1" == "--skip-create-images" ]]; do
+  skip_create_images=1
+  shift
+done
+
+if [ $skip_create_images -ne 1 ]; then
+  pushd ./pulsar-client-cpp/docker
+  ./create-images.sh
+  popd
+fi
+
 source ./pulsar-client-cpp/docker/python-versions.sh
 
 function contains_build_version {