diff --git a/.github/workflows/android-check-metadata.yaml b/.github/workflows/android-check-metadata.yaml
new file mode 100644
index 0000000000..be694db27a
--- /dev/null
+++ b/.github/workflows/android-check-metadata.yaml
@@ -0,0 +1,18 @@
+name: Android Check Metadata
+on:
+  workflow_dispatch: # Manual trigger
+  pull_request:
+    paths:
+      - android/src/fdroid/**
+      - android/src/google/**
+
+jobs:
+  android-check-metadata:
+    name: Check app metadata
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Check metadata
+        run: ./tools/python/check_store_metadata.py android
diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml
index 1170d75e48..2db0da5b79 100644
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -10,8 +10,9 @@ on:
       - LICENSE
       - NOTICE
       - README.md
+      - android/src/fdroid/**
+      - android/src/google/**
       - iphone/**
-      - xcode/**
       - docs/**
       - generator/**
       - packaging/**
@@ -20,6 +21,7 @@ on:
       - skin_generator/**
       - tools/**
       - track_generator/**
+      - xcode/**
 
 jobs:
   android-check:
@@ -68,13 +70,3 @@ jobs:
           name: android-web-arm64-v8a-debug
           path: android/build/outputs/apk/web/debug/OrganicMaps-*-web-debug.apk
           if-no-files-found: error
-
-  android-check-metadata:
-    name: Check app metadata
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Check metadata
-        run: ./tools/python/check_store_metadata.py android
diff --git a/.github/workflows/ios-check-metadata.yaml b/.github/workflows/ios-check-metadata.yaml
new file mode 100644
index 0000000000..ead7d8717b
--- /dev/null
+++ b/.github/workflows/ios-check-metadata.yaml
@@ -0,0 +1,17 @@
+name: iOS Check
+on:
+  workflow_dispatch: # Manual trigger
+  pull_request:
+    paths:
+      - iphone/metadata/**
+
+jobs:
+  ios-check-metadata:
+    name: Check app metadata
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Check metadata
+        run: ./tools/python/check_store_metadata.py ios
diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml
index 53a08130ee..2012eed1ea 100644
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -14,6 +14,7 @@ on:
       - android/**
       - docs/**
       - generator/**
+      - iphone/metadata/**
       - packaging/**
       - pyhelpers/**
       - qt*/**
@@ -57,13 +58,3 @@ jobs:
             'generic/platform=iOS' \
             CODE_SIGNING_REQUIRED=NO \
             CODE_SIGNING_ALLOWED=NO
-
-  ios-check-metadata:
-    name: Check app metadata
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Check metadata
-        run: ./tools/python/check_store_metadata.py ios