diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 87795a65..29de625c 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -9,6 +9,10 @@
     BATCH_BUILD: "1"
     V: "0"
     WARNING_STR: ""
+  parallel:
+    matrix:
+      - DOCLANG: ["en", "zh_CN"]
+        DOCTGT: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2', 'esp32c2', 'esp32p4', 'esp32c5', 'esp32c61', 'other']
 
 # Used to skip the unreasonable build job, need be last in the extends list
 .build_skip: &build_skip
diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml
index a51d2464..50ffc991 100644
--- a/.gitlab/ci/deploy.yml
+++ b/.gitlab/ci/deploy.yml
@@ -50,7 +50,10 @@ push_master_to_github:
     - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
     - export GIT_VER=$(git describe --always)
     - pip install -r ${CI_PROJECT_DIR}/docs/requirements.txt
-    - deploy-docs
+    # Put the output in a logfile that will be used latter to post a comment in the MR
+    - mkdir -p logs
+    - deploy-docs | tee logs/doc-url.txt
+
 
 deploy_docs_preview:
   extends:
@@ -64,8 +67,27 @@ deploy_docs_preview:
     DOCS_DEPLOY_SERVER_USER: "$DOCS_PREVIEW_SERVER_USER"
     DOCS_DEPLOY_PATH: "$DOCS_PREVIEW_PATH"
     DOCS_DEPLOY_URL_BASE: "$DOCS_PREVIEW_URL_BASE"
+  artifacts:
+    when: always
+    paths:
+      - logs/doc-url.txt
+    expire_in: 4 days
   timeout: 3h
 
+post_links:
+  extends:
+    - .rules:deploy:post_links
+  stage: deploy
+  tags: [deploy_docs]
+  image: $ESP_DOCS_ENV_IMAGE
+  needs:
+    - deploy_docs_preview
+  script:
+    - pip install -r ${CI_PROJECT_DIR}/docs/deploy-docs-preview.requirements.txt
+    - ls -al logs
+    - python3 post-mr-note.py $GITLAB_MR_NOTE_TOKEN $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID --url $GITLAB_URL
+
+
 deploy_docs_production:
   extends:
     - .deploy_docs_template
diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml
index 740325ed..619716e9 100644
--- a/.gitlab/ci/docs.yml
+++ b/.gitlab/ci/docs.yml
@@ -7,11 +7,6 @@ variables:
   tags:
     - build_docs
   dependencies: []
-  script:
-    - cd docs
-    - ./check_lang_folder_sync.sh
-    - python -m pip install -r requirements.txt
-    - build-docs -t $DOCTGT -bs $DOC_BUILDERS -l $DOCLANG build
   parallel:
     matrix:
       - DOCLANG: ["en", "zh_CN"]
@@ -21,6 +16,13 @@ build_docs_html:
   extends:
     - .build_docs_template
     - .rules:build:docs
+  script:
+    - cd docs
+    - ./check_lang_folder_sync.sh
+    - python -m pip install -r requirements.txt
+    - ARTIFACT_URL="$CI_JOB_URL/artifacts/file/docs/_build/$DOCLANG/$DOCTGT/html/index.html"
+    - build-docs --skip-reqs-check -l $DOCLANG -t $DOCTGT
+    - echo "esp-dev-kits documentation preview in HTML is available at $ARTIFACT_URL"
   artifacts:
     when: always
     paths:
@@ -34,6 +36,13 @@ build_docs_pdf:
   extends:
     - .build_docs_template
     - .rules:build:docs
+  script:
+    - cd docs
+    - ./check_lang_folder_sync.sh
+    - python -m pip install -r requirements.txt
+    - build-docs --skip-reqs-check -l $DOCLANG -t $DOCTGT
+    - echo "esp-dev-kits documentation preview in PDF is available at:"
+    - echo "$CI_JOB_URL/artifacts/file/docs/_build/$DOCLANG/$DOCTGT/latex/build/esp-dev-kits-$DOCLANG-master-$DOCTGT.pdf"
   artifacts:
     when: always
     paths:
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index ca60fa43..7bead9f6 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -147,3 +147,8 @@
 .rules:deploy:docs_production:
   rules:
     - <<: *if-protected
+
+.rules:deploy:post_links:
+  rules:
+    - <<: *if-dev-push
+      changes: *patterns-docs
diff --git a/docs/deploy-docs-preview.requirements.txt b/docs/deploy-docs-preview.requirements.txt
new file mode 100644
index 00000000..1ee48bd9
--- /dev/null
+++ b/docs/deploy-docs-preview.requirements.txt
@@ -0,0 +1,3 @@
+linuxdoc
+urllib3
+python-gitlab
diff --git a/post-mr-note.py b/post-mr-note.py
new file mode 100644
index 00000000..a888d825
--- /dev/null
+++ b/post-mr-note.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python3
+
+import sys, os, urllib3, argparse
+# Silence the irritating insecure warnings.
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+# Add the location of python-gitlab to the path so we can import it
+repo_top = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..'))
+python_gitlab_dir = os.path.join(repo_top, "external/python-gitlab")
+sys.path.append(python_gitlab_dir)
+import gitlab
+
+
+def getArgs():
+    """
+    Parse the command line arguments.
+    Usage: python post-mr-note.py [PROJECT-TOKEN] [PROJECT] [MR-IID]
+    Sample usage: python post-mr-note.py [PROJECT-TOKEN] documentation/latex-sample-chip-errata-repo 19
+    """
+    parser = argparse.ArgumentParser(
+        description='Post note to existing MR.',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser.add_argument( "authkey", type=str, help="Project or personal access token for authentication with GitLab. Create one at https://gitlab.com/profile/personal_access_tokens" )
+    parser.add_argument( "project", type=str, help="Path to GitLab project in the form <namespace>/<project>")
+    parser.add_argument( "mr_iid", type=str, help="Merge request number to post the message")
+    parser.add_argument( "--url",  help="Gitlab URL.")
+    return parser, parser.parse_args()
+
+
+class PythonGitlabNotes():
+    """
+    Collect links to artifacts saved by other jobs in logs folder.
+    Post the links as a note to an existing merge request.
+    """
+    def __init__(self, url, authkey, project, mr_iid):
+        # Parse command line arguments
+        self.url = url
+        self.url_api = url + '/api/v4'
+        self.authkey = authkey
+        self.project_name = project
+        self.mr_iid = mr_iid
+
+        # Create python-gitlab server instance
+        server = gitlab.Gitlab(self.url, myargs.authkey, api_version=4, ssl_verify=False)
+        # Get an instance of the project and store it off
+        self.project = server.projects.get(self.project_name)
+
+
+    def collect_data(self):
+        series_links = {}
+        with open("logs/doc-url.txt", "r") as file:
+            for line in file:
+                if line.startswith('[document preview]'):
+                    tokens = line.split(']')
+                    desc_url = tokens[2]
+                    lang_chip_info = tokens[1]
+                    lang_chip = lang_chip_info.strip(']').strip('[').split('_')
+
+                    if len(lang_chip) == 2:
+                        language = 'en'
+                        chip_series = lang_chip[1]
+                    elif len(lang_chip) == 3:
+                        language = 'zh_CN'
+                        chip_series = lang_chip[2]
+                    else:
+                        continue
+
+                    language_links = series_links.get(chip_series, {})
+                    language_links[language] = desc_url
+                    series_links[chip_series] = language_links
+
+        self.series_links = series_links
+        print(series_links)  # Debugging line
+
+
+    def prepare_note(self):
+        """
+        Prepare a note with links to be posted in .md format.
+        """
+        note = "Documentation preview:\n\n"
+
+        product_names = {
+            'esp32': 'ESP32',
+            'esp32s2': 'ESP32-S2',
+            'esp32s3': 'ESP32-S3',
+            'esp32c3': 'ESP32-C3',
+            'esp32c6': 'ESP32-C6',
+            'esp32h2': 'ESP32-H2',
+            'esp32c2': 'ESP32-C2',
+            'esp32p4': 'ESP32-P4',
+            'esp32c5': 'ESP32-C5',
+            'esp32c61': 'ESP32-C61',
+            'other': 'Other'
+        }
+
+        for chip_series, language_links in self.series_links.items():
+            product_name = product_names.get(chip_series, chip_series.upper())
+            zh_cn_link = f"[esp-dev-kits 文档]({language_links.get('zh_CN', 'esp-dev-kits 文档')})"
+            en_link = f"[esp-dev-kits Documentation]({language_links.get('en', 'esp-dev-kits Documentation')})"
+            # Combine the links with a slash
+            note += f"- {product_name}: {zh_cn_link}/{en_link}\n"
+
+        self.note = note
+        print(note)
+
+    def post_note(self):
+        """
+        Post the note to the merge request.
+        """
+        # Get the MR
+        mr = self.project.mergerequests.get(self.mr_iid)
+        # Post the note to the MR
+        mr.notes.create({'body': self.note})
+
+    def run(self):
+        self.collect_data()
+        self.prepare_note()
+        self.post_note()
+
+
+if __name__ == '__main__':
+    myParser, myargs = getArgs()
+    sys.exit(PythonGitlabNotes(url=myargs.url, authkey=myargs.authkey,
+        project=myargs.project, mr_iid=myargs.mr_iid).run())