@@ -38,6 +38,10 @@ inputs:
     required: false
     default: /tmp/maestro-android-state/results.json
     description: The path used to persist per-flow test results between retries
+  exclude-tags:
+    required: false
+    default: ''
+    description: Comma-separated flow tags to exclude from the test run
 
 runs:
   using: composite
@@ -77,7 +81,7 @@ runs:
         cores: '4'
         disable-animations: false
         avd-name: e2e_emulator
-        script: node .github/workflow-scripts/maestro-android.js ${{ inputs.app-path }} ${{ inputs.app-id }} ${{ inputs.maestro-flow }} ${{ inputs.flavor }} ${{ inputs.working-directory }} ${{ inputs.test-state-path }}
+        script: node .github/workflow-scripts/maestro-android.js ${{ inputs.app-path }} ${{ inputs.app-id }} ${{ inputs.maestro-flow }} ${{ inputs.flavor }} ${{ inputs.working-directory }} ${{ inputs.test-state-path }} "${{ inputs.exclude-tags }}"
     - name: Normalize APP_ID
       id: normalize-app-id
       shell: bash
 
@@ -14,6 +14,7 @@ const path = require('path');
 const {
   collectFlows,
   executeFlowSuite,
+  filterFlowsByTags,
   loadState,
 } = require('../maestro-android');
 
@@ -45,6 +46,26 @@ describe('Maestro Android runner', () => {
     ]);
   });
 
+  it('excludes flows with matching tags', () => {
+    const releaseOnlyFlow = path.join(
+      temporaryDirectory,
+      'android-release-only.yml',
+    );
+    const regularFlow = path.join(temporaryDirectory, 'regular.yml');
+    fs.writeFileSync(
+      releaseOnlyFlow,
+      'appId: x\ntags:\n  - android-release-only\n---\n- launchApp\n',
+    );
+    fs.writeFileSync(regularFlow, 'appId: x\n---\n- launchApp\n');
+
+    expect(
+      filterFlowsByTags(
+        [releaseOnlyFlow, regularFlow],
+        ['android-release-only'],
+      ),
+    ).toEqual([regularFlow]);
+  });
+
   it('runs every flow and retries only flows that have not passed', () => {
     const flows = ['first.yml', 'second.yml', 'third.yml'].map(file =>
       path.join(temporaryDirectory, file),
 
@@ -13,14 +13,15 @@ const path = require('path');
 
 const usage = `
 === Usage ===
-node maestro-android.js <path to app> <app_id> <maestro_flow> <flavor> <working_directory> [test_state_path]
+node maestro-android.js <path to app> <app_id> <maestro_flow> <flavor> <working_directory> [test_state_path] [exclude_tags]
 
 @param {string} appPath - Path to the app APK
 @param {string} appId - App ID that needs to be launched
 @param {string} maestroFlow - Path to the Maestro flow or folder to execute
 @param {string} flavor - Flavor of the app to be launched. Can be 'release' or 'debug'
 @param {string} workingDirectory - Working directory from where to run Metro
 @param {string} testStatePath - File used to persist per-flow results between CI retries
+@param {string} excludeTags - Comma-separated flow tags to exclude
 ==============
 `;
 
@@ -63,6 +64,39 @@ function collectFlows(flowPath) {
   return flows;
 }
 
+function getFlowTags(flow) {
+  const contents = fs.readFileSync(flow, 'utf8');
+  const tags = [];
+  const tagBlockPattern = /^tags:\s*\r?\n((?:^[ \t]+-[ \t]*[^\r\n]+\r?\n?)*)/gm;
+
+  for (const match of contents.matchAll(tagBlockPattern)) {
+    for (const line of match[1].split(/\r?\n/)) {
+      const tag = line.match(/^[ \t]+-[ \t]*(.+?)\s*$/)?.[1];
+      if (tag != null) {
+        tags.push(tag);
+      }
+    }
+  }
+
+  return tags;
+}
+
+function filterFlowsByTags(flows, excludeTags) {
+  if (excludeTags.length === 0) {
+    return flows;
+  }
+
+  return flows.filter(flow => {
+    const tags = getFlowTags(flow);
+    const excludedTag = tags.find(tag => excludeTags.includes(tag));
+    if (excludedTag != null) {
+      console.info(`Skipping flow tagged ${excludedTag}: ${flow}`);
+      return false;
+    }
+    return true;
+  });
+}
+
 function getFlowKey(flow) {
   return path
     .relative(process.cwd(), path.resolve(flow))
@@ -274,7 +308,7 @@ function executeFlowSuite({
 }
 
 async function main(args = process.argv.slice(2)) {
-  if (args.length < 5 || args.length > 6) {
+  if (args.length < 5 || args.length > 7) {
     throw new Error(`Invalid number of arguments.\n${usage}`);
   }
 
@@ -284,6 +318,10 @@ async function main(args = process.argv.slice(2)) {
   const isDebug = args[3] === 'debug';
   const workingDirectory = args[4];
   const statePath = args[5] ?? DEFAULT_STATE_PATH;
+  const excludeTags = (args[6] ?? '')
+    .split(',')
+    .map(tag => tag.trim())
+    .filter(Boolean);
 
   console.info('\n==============================');
   console.info('Running tests for Android with the following parameters:');
@@ -293,6 +331,7 @@ async function main(args = process.argv.slice(2)) {
   console.info(`IS_DEBUG: ${isDebug}`);
   console.info(`WORKING_DIRECTORY: ${workingDirectory}`);
   console.info(`TEST_STATE_PATH: ${statePath}`);
+  console.info(`EXCLUDE_TAGS: ${excludeTags.join(',') || '<none>'}`);
   console.info('==============================\n');
 
   logAndroidAbiConfiguration();
@@ -338,7 +377,7 @@ async function main(args = process.argv.slice(2)) {
 
   let error = null;
   try {
-    const flows = collectFlows(maestroFlow);
+    const flows = filterFlowsByTags(collectFlows(maestroFlow), excludeTags);
     const state = loadState(statePath);
     console.info(`Start testing ${flows.length} flow(s)`);
     executeFlowSuite({flows, appId, state, statePath});
@@ -378,6 +417,7 @@ if (require.main === module) {
 module.exports = {
   collectFlows,
   executeFlowSuite,
+  filterFlowsByTags,
   formatResults,
   loadState,
 };
@@ -71,6 +71,10 @@ jobs:
           emulator-api-level: '35'
           emulator-target: google_apis
           emulator-arch: x86_64
+          # These timing-sensitive flows remain covered by the release APK.
+          # Running the debug ARM64 APK through native translation can delay
+          # React commits long enough for Maestro to miss taps and assertions.
+          exclude-tags: ${{ matrix.flavor == 'debug' && 'android-release-only' || '' }}
       - name: Store per-flow test state
         if: always()
         uses: actions/upload-artifact@v6
 
@@ -1,6 +1,8 @@
 # Test FlatList maintainVisibleContentPosition with append (baseline)
 # Appending items should NOT affect scroll offset (delta ~0)
 appId: ${APP_ID}
+tags:
+  - android-release-only
 ---
 - launchApp
 # Change to portrait
 
@@ -1,6 +1,8 @@
 # Test FlatList maintainVisibleContentPosition — complex concurrent mutations
 # Tests prepend + append + delete in sequence
 appId: ${APP_ID}
+tags:
+  - android-release-only
 ---
 - launchApp
 - setOrientation: portrait
 
@@ -1,6 +1,8 @@
 # Test FlatList maintainVisibleContentPosition — delete anchor item
 # When the anchor item (first visible) is deleted, MVCP should select a new anchor
 appId: ${APP_ID}
+tags:
+  - android-release-only
 ---
 - launchApp
 - setOrientation: portrait
 
@@ -1,6 +1,8 @@
 # Test FlatList maintainVisibleContentPosition — delete from middle
 # When items are deleted from the middle, MVCP should adjust scroll offset
 appId: ${APP_ID}
+tags:
+  - android-release-only
 ---
 - launchApp
 - setOrientation: portrait
 
@@ -3,6 +3,8 @@
 # _firstVisibleView.frame on nil returns {0,0}, causing incorrect scroll
 # correction.
 appId: ${APP_ID}
+tags:
+  - android-release-only
 ---
 - launchApp
 # Change to portrait
 
@@ -1,6 +1,8 @@
 # Test FlatList maintainVisibleContentPosition — first prepend only
 # Single prepend with fixed-height items: delta should be ~44px (40px height + 4px margin)
 appId: ${APP_ID}
+tags:
+  - android-release-only
 ---
 - launchApp
 # Change to portrait