diff --git a/.github/workflows/i18n-pull.yml b/.github/workflows/i18n-pull.yml
index 7a8e27c38..e0007bb5f 100644
--- a/.github/workflows/i18n-pull.yml
+++ b/.github/workflows/i18n-pull.yml
@@ -3,14 +3,14 @@ name: Crowdin (pull)
 on:
   schedule:
     - cron: '0 7 * * MON' # every monday at 7 am
-  workflow_dispatch: {}
+  workflow_dispatch:
 
 concurrency:
   group: i18n-management
 
 jobs:
-  preflight_check:
-    name: 'Pre-flight check'
+  pull_translations:
+    name: 'Pull translations from Crowdin'
     runs-on: ubuntu-22.04
     if: github.ref == 'refs/heads/main'
     concurrency:
@@ -18,7 +18,6 @@ jobs:
       cancel-in-progress: true
     steps:
       - name: Preflight check
-        id: check
         run: |
           PREFLIGHT_CHECK_RESULT=true
 
@@ -43,23 +42,14 @@ jobs:
             flight_failure "CROWDIN_GH_TOKEN secret is not defined (required to make pull requests)"
           fi
 
-          echo "flight_ok=$PREFLIGHT_CHECK_RESULT" >> "$GITHUB_OUTPUT"
+          if [ "$PREFLIGHT_CHECK_RESULT" = false ]; then
+            exit 1
+          fi
         env:
           CROWDIN_PROJECT_ID_DEFINED: ${{ vars.CROWDIN_PROJECT_ID != '' }}
           CROWDIN_PERSONAL_TOKEN_DEFINED: ${{ secrets.CROWDIN_PERSONAL_TOKEN != '' }}
           CROWDIN_GH_TOKEN_DEFINED: ${{ secrets.CROWDIN_GH_TOKEN != '' }}
-    outputs:
-      ready: ${{ steps.check.outputs.flight_ok == 'true' }}
 
-  pull_translations:
-    name: 'Pull translations from Crowdin'
-    needs: preflight_check
-    if: needs.preflight_check.outputs.ready == 'true'
-    runs-on: ubuntu-22.04
-    concurrency:
-      group: i18n-pull:${{ github.ref }}
-      cancel-in-progress: true
-    steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/i18n-push.yml b/.github/workflows/i18n-push.yml
index 25d7b4b28..812b6e0d1 100644
--- a/.github/workflows/i18n-push.yml
+++ b/.github/workflows/i18n-push.yml
@@ -4,19 +4,20 @@ on:
   push:
     branches: ['main']
     paths:
+      - '.github/workflows/i18n.push.yml'
       - 'apps/*/src/locales/en-US/**'
       - 'apps/*/locales/en-US/**'
       - 'packages/*/src/locales/en-US/**'
       - 'packages/*/locales/en-US/**'
       - 'crowdin.yml'
-  workflow_dispatch: {}
+  workflow_dispatch:
 
 concurrency:
   group: i18n-management
 
 jobs:
-  preflight_check:
-    name: 'Pre-flight check'
+  push_translations:
+    name: Push sources to Crowdin
     runs-on: ubuntu-22.04
     if: github.ref == 'refs/heads/main'
     concurrency:
@@ -24,7 +25,6 @@ jobs:
       cancel-in-progress: true
     steps:
       - name: Preflight check
-        id: check
         run: |
           PREFLIGHT_CHECK_RESULT=true
 
@@ -48,58 +48,15 @@ jobs:
           if [ "$PREFLIGHT_CHECK_RESULT" = false ]; then
             exit 1
           fi
-
-          echo "flight_ok=$PREFLIGHT_CHECK_RESULT" >> "$GITHUB_OUTPUT"
         env:
           CROWDIN_PROJECT_ID_DEFINED: ${{ vars.CROWDIN_PROJECT_ID != '' }}
           CROWDIN_PERSONAL_TOKEN_DEFINED: ${{ secrets.CROWDIN_PERSONAL_TOKEN != '' }}
-    outputs:
-      ready: ${{ steps.check.outputs.flight_ok == 'true' }}
 
-  push_translations:
-    name: Push sources to Crowdin
-    needs: preflight_check
-    if: needs.preflight_check.outputs.ready == 'true'
-    concurrency:
-      group: i18n-push:${{ github.ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-22.04
-    steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-
-      - name: Install pnpm via corepack
-        shell: bash
-        run: |
-          corepack enable
-          corepack prepare --activate
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - name: Setup pnpm cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Extract translations
-        run: pnpm intl:extract
-
       - name: Query branch name
         id: branch-name
         shell: bash