diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 01faa0b804..3801c73ced 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -88,10 +88,38 @@ jobs:
       - run: nx run stories:build-storybook --configuration ci
       - uses: ./.github/actions/upload-cache-and-artifacts
 
-  playwright:
+    unit-tests:
+      timeout-minutes: 30
+      name: "Build Components"
+      runs-on: ubuntu-22.04
+      needs: [main]
+      strategy:
+        fail-fast: false
+        # max-parallel: 4
+        matrix:
+          unit-tests:
+            - name: content-services
+              exclude: "insights,core,extensions,process-services,process-services-cloud"
+            - name: core
+              exclude: "insights,content-services,process-services,process-services-cloud"
+            - name: insights
+              exclude: "core,extensions,content-services,process-services-cloud"
+            - name: process-cloud
+              exclude: "insights,core,extensions,content-services,process-services"   
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v3
+          with:
+            fetch-depth: 0 # Fetch all history for all tags and branches
+        - uses: ./.github/actions/setup
+        - uses: ./.github/actions/download-cache-and-artifacts
+        - name: Run unit tests
+          run: nx affected:test $NX_CALCULATION_FLAGS --exclude="${{ matrix.unit-tests.exclude }}"
+
+  e2e storybook:
     timeout-minutes: 20
     name: "playwright"
-    needs: [main]
+    needs: [unit-tests]
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
@@ -110,7 +138,7 @@ jobs:
   e2e:
     timeout-minutes: 90
     name: "e2e: ${{ matrix.e2e-test.description }}"
-    needs: [playwright]
+    needs: [unit-tests]
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false