diff --git a/docs/conf_common.py b/docs/conf_common.py
index 505dab8a0c..961f7a8391 100644
--- a/docs/conf_common.py
+++ b/docs/conf_common.py
@@ -95,6 +95,11 @@ kconfigs = find_component_files("../../components", "Kconfig")
 kconfig_projbuilds = find_component_files("../../components", "Kconfig.projbuild")
 sdkconfig_renames = find_component_files("../../components", "sdkconfig.rename")
 
+# trim the esp32s2beta component, until we have proper multi-target support
+kconfigs = [k for k in kconfigs if "esp32s2beta" not in k]
+kconfig_projbuilds = [k for k in kconfig_projbuilds if "esp32s2beta" not in k]
+sdkconfig_renames = [r for r in sdkconfig_renames if "esp32s2beta" not in r]
+
 confgen_args = [sys.executable,
                 "../../tools/kconfig_new/confgen.py",
                 "--kconfig", "../../Kconfig",
diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index afeba1692d..b2bb84b55a 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -250,13 +250,11 @@ build_docs:
     - cd en
     - make gh-linkcheck
     - make html
-    # TODO: revert it before release esp32s2
-    # - ../check_doc_warnings.sh
+    - ../check_doc_warnings.sh
     - cd ../zh_CN
     - make gh-linkcheck
     - make html
-    # TODO: revert it before release esp32s2
-    #- ../check_doc_warnings.sh
+    - ../check_doc_warnings.sh
 
 verify_cmake_style:
   extends: .check_job_template