diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index 5aaee5cd1..a3593441a 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -231,7 +231,7 @@ build_test_apps_esp32s2:
 
 .build_docs_template: &build_docs_template
   stage: build
-  image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2-d4034371
+  image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2
   tags:
     - build_docs
   artifacts:
diff --git a/tools/ci/config/deploy.yml b/tools/ci/config/deploy.yml
index acdd0e125..e5c90db0d 100644
--- a/tools/ci/config/deploy.yml
+++ b/tools/ci/config/deploy.yml
@@ -74,6 +74,7 @@ push_to_github:
   cd docs/_build/$DOCLANG/$DOCTGT
   mv html $GIT_VER
   tar czf $GIT_VER.tar.gz $GIT_VER
+  ssh $DOCS_SERVER -x "mkdir -p $DOCS_PATH/$DOCLANG/$DOCTGT"
   scp $GIT_VER.tar.gz $DOCS_SERVER:$DOCS_PATH/$DOCLANG/$DOCTGT
   ssh $DOCS_SERVER -x "cd $DOCS_PATH/$DOCLANG/$DOCTGT && tar xzf $GIT_VER.tar.gz && rm -f latest && ln -s $GIT_VER latest"
   cd -
diff --git a/tools/ci/config/post_deploy.yml b/tools/ci/config/post_deploy.yml
index 8cc46821a..841f10ecc 100644
--- a/tools/ci/config/post_deploy.yml
+++ b/tools/ci/config/post_deploy.yml
@@ -1,6 +1,6 @@
 .check_doc_links_template: &check_doc_links_template
   stage: post_deploy
-  image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2-d4034371
+  image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2
   tags: [ "build", "amd64", "internet" ]
   only:
     - master