diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82732b3c11e..8575de0fc9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ include:
       - "templates/idf/v2/pre_check.yml"
       - "templates/idf/pre-commit.yml"
       - "templates/idf/build.yml"
-      - "templates/idf/deploy-github.yml"
+      - "templates/idf/v2/deploy-github.yml"
       - "templates/idf/deploy-docs.yml"
       - "templates/idf/integration-test.yml"
       - "templates/idf/sync-files.yml"
@@ -30,9 +30,8 @@ include:
   - ".gitlab/ci/manual_gate.yml"
   - ".gitlab/ci/upload_cache.yml"
   - ".gitlab/ci/pre_check.yml"
-  - ".gitlab/ci/pre_deploy.yml"
   - ".gitlab/ci/static-code-analysis.yml"
   - ".gitlab/ci/build.yml"
   - ".gitlab/ci/host-test.yml"
-  - ".gitlab/ci/post_deploy.yml"
   - ".gitlab/ci/test-win.yml"
+  - ".gitlab/ci/post_deploy.yml"
diff --git a/.gitlab/ci/pre_deploy.yml b/.gitlab/ci/pre_deploy.yml
deleted file mode 100644
index a1bdde91f42..00000000000
--- a/.gitlab/ci/pre_deploy.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-.pre_deploy_template:
-  stage: pre_deploy
-  image: $ESP_ENV_IMAGE
-  dependencies: []
-
-check_submodule_sync:
-  extends:
-    - .pre_deploy_template
-    - .rules:test:submodule
-  tags: [ brew, github_sync ]
-  retry: 2
-  variables:
-    GIT_STRATEGY: fetch  # use brew local mirror first
-    SUBMODULES_TO_FETCH: "none"
-    PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
-  script:
-    - git submodule deinit --force .
-    - rm -rf .git/modules  # remove all the cached metadata
-    # setting the default remote URL to the public one, to resolve relative location URLs
-    - git config remote.origin.url ${PUBLIC_IDF_URL}
-    # check if all submodules are correctly synced to public repository
-    - git submodule init
-    - git config --get-regexp '^submodule\..*\.url$' || true
-    - git submodule update --recursive
-    - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"