diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index 839d799bc3b..8bdc72a5aa4 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -19,39 +19,39 @@ rapids-print-env
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
-VERSION_NUMBER="23.08"
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
   libcudf cudf dask-cudf
 
+export RAPIDS_VERSION_NUMBER="23.08"
+export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
-rapids-logger "Build Doxygen docs"
+rapids-logger "Build CPP docs"
 pushd cpp/doxygen
-aws s3 cp s3://rapidsai-docs/librmm/${VERSION_NUMBER}/html/rmm.tag . || echo "Failed to download rmm Doxygen tag"
+aws s3 cp s3://rapidsai-docs/librmm/${RAPIDS_VERSION_NUMBER}/html/rmm.tag . || echo "Failed to download rmm Doxygen tag"
 doxygen Doxyfile
+mkdir -p "${RAPIDS_DOCS_DIR}/libcudf/html"
+mv html/* "${RAPIDS_DOCS_DIR}/libcudf/html"
 popd
 
-rapids-logger "Build cuDF Sphinx docs"
+rapids-logger "Build Python docs"
 pushd docs/cudf
 sphinx-build -b dirhtml source _html
 sphinx-build -b text source _text
+mkdir -p "${RAPIDS_DOCS_DIR}/cudf/"{html,txt}
+mv _html/* "${RAPIDS_DOCS_DIR}/cudf/html"
+mv _text/* "${RAPIDS_DOCS_DIR}/cudf/txt"
 popd
 
-
 rapids-logger "Build dask-cuDF Sphinx docs"
 pushd docs/dask_cudf
 sphinx-build -b dirhtml source _html
 sphinx-build -b text source _text
+mkdir -p "${RAPIDS_DOCS_DIR}/dask_cudf/"{html,txt}
+mv _html/* "${RAPIDS_DOCS_DIR}/dask_cudf/html"
+mv _text/* "${RAPIDS_DOCS_DIR}/dask_cudf/txt"
 popd
 
-
-if [[ "${RAPIDS_BUILD_TYPE}" != "pull-request" ]]; then
-  rapids-logger "Upload Docs to S3"
-  aws s3 sync --no-progress --delete cpp/doxygen/html "s3://rapidsai-docs/libcudf/${VERSION_NUMBER}/html"
-  aws s3 sync --no-progress --delete docs/cudf/_html "s3://rapidsai-docs/cudf/${VERSION_NUMBER}/html"
-  aws s3 sync --no-progress --delete docs/cudf/_text "s3://rapidsai-docs/cudf/${VERSION_NUMBER}/txt"
-  aws s3 sync --no-progress --delete docs/dask_cudf/_html "s3://rapidsai-docs/dask-cudf/${VERSION_NUMBER}/html"
-  aws s3 sync --no-progress --delete docs/dask_cudf/_text "s3://rapidsai-docs/dask-cudf/${VERSION_NUMBER}/txt"
-fi
+rapids-upload-docs
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index 575efcb63e0..92627b6e83b 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -111,4 +111,4 @@ for FILE in .github/workflows/*.yaml; do
   sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
   sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE};
 done
-sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh
+sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh