diff --git a/.github/workflows/data-backend.yml b/.github/workflows/data-backend.yml
index ce1555df..f87c034d 100644
--- a/.github/workflows/data-backend.yml
+++ b/.github/workflows/data-backend.yml
@@ -54,11 +54,11 @@ jobs:
             pnpm install
           fi
 
-      # - name: Prettier Format Check
-      #   run: pnpm format:check
+      - name: Build
+        run: pnpm build:all
 
       - name: TypeScript Check
         run: pnpm ts:check
 
-      - name: Build
-        run: pnpm build
+      # - name: Prettier Format Check
+      #   run: pnpm format:check
diff --git a/.github/workflows/indexer-v2.yml b/.github/workflows/indexer-v2.yml
new file mode 100644
index 00000000..e19de2e2
--- /dev/null
+++ b/.github/workflows/indexer-v2.yml
@@ -0,0 +1,64 @@
+name: Indexer v2 App
+
+on:
+  push:
+    paths:
+      - ".github/workflows/indexer-v2.yml"
+      - "apps/indexer-v2/**"
+      - "package.json"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "apps/indexer-v2/**"
+
+jobs:
+  check-app:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./apps/indexer-v2
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - 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: |
+          if [ -f "pnpm-lock.yaml" ]; then
+            pnpm install --frozen-lockfile
+          else
+            pnpm install
+          fi
+
+      - name: Build
+        run: pnpm build:all
+
+      - name: TypeScript Check
+        run: pnpm ts:check
+
+      # - name: Prettier Format Check
+      #   run: pnpm format:check
diff --git a/.github/workflows/nestjs-indexer.yml b/.github/workflows/nestjs-indexer.yml
index bf3618c9..199318dc 100644
--- a/.github/workflows/nestjs-indexer.yml
+++ b/.github/workflows/nestjs-indexer.yml
@@ -54,15 +54,11 @@ jobs:
             pnpm install
           fi
 
-      - name: Build Prisma client
-        run: pnpm generate
-        working-directory: ./packages/indexer-prisma
-
-      # - name: Prettier Format Check
-      #   run: pnpm format:check
+      - name: Build
+        run: pnpm build:all
 
       - name: TypeScript Check
         run: pnpm ts:check
 
-      - name: Build
-        run: pnpm build
+      # - name: Prettier Format Check
+      #   run: pnpm format:check
diff --git a/apps/indexer-v2/package.json b/apps/indexer-v2/package.json
index 5f79a5b0..744a4656 100644
--- a/apps/indexer-v2/package.json
+++ b/apps/indexer-v2/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "build": "apibara build",
     "build:db": "pnpm -w run build:indexer-v2-db",
-    "build:all": "pnpm -w run build:indexer-v2-db && apibara build",
+    "build:all": "pnpm build:db && pnpm build",
     "dev": "apibara dev",
     "start": "apibara start",
     "lint": "biome check .",