diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 871dc7a1bb..589a89528f 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -197,9 +197,6 @@
   - "components/bt/esp_ble_mesh/lib/lib"
   - ".gitmodules"
 
-.patterns-danger-npm: &patterns-danger-npm
-  - ".gitlab/dangerjs/package-lock.json"
-
 # for jobs: flash_encryption_wifi_high_traffic
 .patterns-example_test-ota-nightly_run: &patterns-example_test-ota-nightly_run
   - "examples/system/ota/**/*"
@@ -337,6 +334,10 @@
 .if-protected-no_label: &if-protected-no_label
   if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) && $BOT_TRIGGER_WITH_LABEL == null'
 
+.if-protected-ref-push: &if-protected-ref-push
+  # rules:changes always evaluates to true for new branch pipelines or when there is no Git push event
+  if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/) && $CI_PIPELINE_SOURCE == "push"'
+
 .if-qa-test-tag: &if-qa-test-tag
   if: '$CI_COMMIT_TAG =~ /^qa-test/'
 
@@ -405,32 +406,26 @@
   rules:
     - <<: *if-tag-release
 
-### Patterns ###
-.rules:patterns:python-cache:
+# Do not upload caches on dev branches by default
+.rules:upload-python-cache:
   rules:
     - <<: *if-tag-release
     - <<: *if-schedule-nightly
-    - <<: *if-label-upload_cache
-      when: manual
-    - <<: *if-dev-push
+    - <<: *if-protected-ref-push
       changes: *patterns-python-cache
+    - <<: *if-label-upload_cache
+      when: manual
 
-.rules:patterns:submodule:
+.rules:upload-submodule-cache:
   rules:
+    # Needn't upload submodule cache in schedule pipeline
     - <<: *if-tag-release
-    - <<: *if-schedule-nightly
-    - <<: *if-label-upload_cache
-      when: manual
-    - <<: *if-dev-push
+    - <<: *if-protected-ref-push
       changes: *patterns-submodule
-
-.rules:patterns:dangerjs:
-  rules:
     - <<: *if-label-upload_cache
       when: manual
-    - <<: *if-dev-push
-      changes: *patterns-danger-npm
 
+### Patterns ###
 .rules:patterns:clang_tidy:
   rules:
     - <<: *if-protected
diff --git a/.gitlab/ci/upload_cache.yml b/.gitlab/ci/upload_cache.yml
index 30e49b545a..173b63224b 100644
--- a/.gitlab/ci/upload_cache.yml
+++ b/.gitlab/ci/upload_cache.yml
@@ -10,7 +10,7 @@ upload-pip-cache:
   extends:
     - .upload_cache_template
     - .before_script:minimal
-    - .rules:patterns:python-cache
+    - .rules:upload-python-cache
   tags:
     - $GEO
     - cache
@@ -30,7 +30,7 @@ upload-submodules-cache:
   extends:
     - .upload_cache_template
     - .before_script:minimal
-    - .rules:patterns:submodule
+    - .rules:upload-submodule-cache
   tags:
     - $GEO
     - cache