diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 3f2c146a48..9edf69f1d2 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -70,7 +70,7 @@ env:
 jobs:
   setup:
 
-    # long timeout required when cache has to be recreated    
+    # long timeout required when cache has to be recreated
     timeout-minutes: 30
     name: "Setup"
     runs-on: ubuntu-22.04
@@ -105,14 +105,14 @@ jobs:
           - name: insights
             exclude: "core,extensions,content-services,process-services-cloud"
           - name: process-cloud
-            exclude: "insights,core,extensions,content-services,process-services"   
+            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   
+      - uses: ./.github/actions/download-cache-and-artifacts
       - name: Run unit tests
         run: |
           /usr/bin/xvfb-run --auto-servernum nx affected:test $NX_CALCULATION_FLAGS --exclude=${{ matrix.unit-tests.exclude }}
@@ -147,7 +147,7 @@ jobs:
       - uses: ./.github/actions/download-cache-and-artifacts
       - run: nx affected:build $NX_CALCULATION_FLAGS --prod
       - run: nx build demoshell --configuration production
-      - run: nx run stories:build-storybook --configuration ci
+      - run: nx affected --target=build-storybook $NX_CALCULATION_FLAGS --configuration ci
       - uses: ./.github/actions/upload-cache-and-artifacts
 
   e2e-storybook:
@@ -166,7 +166,7 @@ jobs:
         run: |
           npx playwright install chromium
           sudo sysctl -w fs.inotify.max_user_watches=524288
-          npx playwright test --config='e2e-playwright/playwright.config.ts' || exit 1
+          npx nx affected --target=e2e-playwright $NX_CALCULATION_FLAGS || exit 1
       - uses: ./.github/actions/upload-cache-and-artifacts
 
   e2e:
@@ -315,4 +315,4 @@ jobs:
           check-ps-cloud-env: ${{ matrix.e2e-test.check-ps-cloud-env }}
           check-external-cs-env: ${{ matrix.e2e-test.check-external-cs-env }}
           apa-proxy: ${{ matrix.e2e-test.apa-proxy }}
-#
\ No newline at end of file
+#
diff --git a/angular.json b/angular.json
index 4ddab55bc9..dfc954612c 100644
--- a/angular.json
+++ b/angular.json
@@ -678,6 +678,17 @@
             }
           }
         },
+
+        "e2e-playwright": {
+          "executor": "nx:run-commands",
+              "options": {
+              "commands": [
+                  {
+                      "command": "$(npm bin)/playwright test --config='e2e-playwright/playwright.config.ts'"
+                  }
+              ]
+          }
+        },
         "spellcheck": {
           "executor": "nx:run-commands",
               "options": {