diff --git a/.github/labeler.yml b/.github/labeler.yml
index ae076f92e36001..6e52598d8782b7 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -126,6 +126,11 @@ setup payload:
 ############################################################
 platform:
     - src/platform/*
+    - config/tizen/chip-gn/platform/*
+    - examples/platform/*
+    - scripts/tools/memory/platform/*
+    - src/include/platform/*
+    - src/lib/dnssd/platform/*
 
 darwin:
     - src/platform/Darwin/*
diff --git a/.github/workflows/cherry-picks.yaml b/.github/workflows/cherry-picks.yaml
index 9b24d369bb2019..ac113172aa4748 100644
--- a/.github/workflows/cherry-picks.yaml
+++ b/.github/workflows/cherry-picks.yaml
@@ -1,38 +1,42 @@
 name: Cherry-Pick Merges
 
 on:
-  pull_request_target:
-    branches:
-      - master
-    types: ["closed"]
+    pull_request_target:
+        branches:
+            - master
+        types: ["closed"]
 
 jobs:
-  cherry_pick_release_v1_0:
-    runs-on: ubuntu-latest
-    name: Cherry-Pick into SVE
-    if: |
-      (github.event.pull_request.merged == true)
-      && (
-             (contains(github.event.pull_request.labels.*.name, 'sve'))
-          || (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
-          || (contains(github.event.pull_request.labels.*.name, 'spec'))
-          || (contains(github.event.pull_request.labels.*.name, 'platform'))
-          || (contains(github.event.pull_request.labels.*.name, 'darwin'))
-          || (contains(github.event.pull_request.labels.*.name, 'android'))
-          || (contains(github.event.pull_request.labels.*.name, 'sve cherry-pick'))
-      )
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Cherry-Pick into sve branch
-        uses: carloscastrojumo/github-cherry-pick-action@v1.0.1
-        with:
-          token: ${{ secrets.MATTER_PAT }}
-          branch: sve
-          reviewers: |
-            woody-apple
-            andy31415
+    cherry_pick_release_v1_0:
+        runs-on: ubuntu-latest
+        name: Cherry-Pick into SVE
+        if: |
+            (github.event.pull_request.merged == true)
+            && (
+                   (contains(github.event.pull_request.labels.*.name, 'sve'))
+                || (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
+                || (contains(github.event.pull_request.labels.*.name, 'spec'))
+                || (contains(github.event.pull_request.labels.*.name, 'platform'))
+                || (contains(github.event.pull_request.labels.*.name, 'darwin'))
+                || (contains(github.event.pull_request.labels.*.name, 'android'))
+                || (contains(github.event.pull_request.labels.*.name, 'examples'))
+                || (contains(github.event.pull_request.labels.*.name, 'scripts'))
+                || (contains(github.event.pull_request.labels.*.name, 'workflows'))
+                || (contains(github.event.pull_request.labels.*.name, 'github'))
+                || (contains(github.event.pull_request.labels.*.name, 'sve cherry-pick'))
+            )
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+            - name: Cherry-Pick into sve branch
+              uses: carloscastrojumo/github-cherry-pick-action@v1.0.1
+              with:
+                  token: ${{ secrets.MATTER_PAT }}
+                  branch: sve
+                  reviewers: |
+                      woody-apple
+                      andy31415
 env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}