diff --git a/site2/tools/docker-build-site.sh b/site2/tools/docker-build-site.sh
index cc4a5e7d70ea8..ba81fb4a33a64 100755
--- a/site2/tools/docker-build-site.sh
+++ b/site2/tools/docker-build-site.sh
@@ -27,7 +27,7 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
 cd $ROOT_DIR/pulsar-client-cpp
 
 BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
-BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04}"
+BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-py2}"
 
 IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION"
 
diff --git a/site2/tools/python-doc-gen.sh b/site2/tools/python-doc-gen.sh
index 1c4a70e320e07..1f6b7227bb6bb 100755
--- a/site2/tools/python-doc-gen.sh
+++ b/site2/tools/python-doc-gen.sh
@@ -30,12 +30,14 @@ find $ROOT_DIR -name CMakeFiles | xargs rm -rf
 find $ROOT_DIR -name PulsarApi.pb.h | xargs rm -rf
 find $ROOT_DIR -name PulsarApi.pb.cc | xargs rm -rf
 cd $ROOT_DIR/pulsar-client-cpp
-cmake .
+export CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DBUILD_DYNAMIC_LIB=OFF -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7.so"
+cmake . $CMAKE_ARGS
 make -j8 _pulsar
 pip install enum34
 pip install six
 pip install fastavro
 pip install certifi
+pip install pdoc
 
 # Create documentation
 DESTINATION=$ROOT_DIR/generated-site/api/python/${VERSION}