diff --git a/.github/workflows/storybook-build-fork.yml b/.github/workflows/storybook-build-fork.yml
new file mode 100644
index 00000000..4a08615f
--- /dev/null
+++ b/.github/workflows/storybook-build-fork.yml
@@ -0,0 +1,25 @@
+name: Build Storybook (Fork)
+on: 
+  pull_request:
+      branches:
+        - 'main'
+jobs:
+  build-storybooks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: npm ci
+      - name: Build PIA Storybook
+        run: npx nx run portal-integration-angular:build-storybook
+      - name: Build AA Storybook
+        run: npx nx run angular-accelerator:build-storybook
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+            name: storybook-dist
+            path: dist/storybook/
+            
diff --git a/.github/workflows/storybook-deploy-fork.yml b/.github/workflows/storybook-deploy-fork.yml
new file mode 100644
index 00000000..42c43cd0
--- /dev/null
+++ b/.github/workflows/storybook-deploy-fork.yml
@@ -0,0 +1,39 @@
+name: Deploy Storybook (Fork)
+on:
+    workflow_run:
+      workflows: ["Build Storybook (Fork)"]
+      types:
+        - completed
+jobs:
+    deploy-storybook:
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        environment: Storybook
+        env:
+          PIA_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN_PIA }}
+          AA_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN_AA }}
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout code
+            uses: actions/checkout@v4
+            with:
+              fetch-depth: 0
+          - name: Download build artifacts
+            uses: dawidd6/action-download-artifact@v3
+            with:
+              run_id: ${{ github.event.workflow_run.id }}
+              name: storybook-dist
+          - name: Publish to PIA Chromatic
+            uses: chromaui/action@latest
+            if: env.PIA_TOKEN != null
+            with:
+              projectToken: ${{ env.PIA_TOKEN }}
+              storybookBuildDir: storybook-dist/portal-integration-angular
+              skip: 'dependabot/**'
+          - name: Publish to AA Chromatic
+            uses: chromaui/action@latest
+            if: env.AA_TOKEN != null
+            with:
+              projectToken: ${{ env.AA_TOKEN }}
+              storybookBuildDir: storybook-dist/angular-accelerator
+              skip: 'dependabot/**'
+            
\ No newline at end of file
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 4cec7e3c..8dc4bd51 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -3,12 +3,13 @@ on:
   push:
     branches:
       - '**'
-  pull_request_target:
-      branches:
-        - 'main'
 jobs:
   deploy-storybooks:
     runs-on: ubuntu-latest
+    environment: Storybook
+    env:
+      PIA_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN_PIA }}
+      AA_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN_AA }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -21,7 +22,7 @@ jobs:
       - name: Publish to PIA Chromatic
         uses: chromaui/action@latest
         with:
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN_PIA }}
+          projectToken: ${{ env.PIA_TOKEN }}
           storybookBuildDir: dist/storybook/portal-integration-angular
           skip: 'dependabot/**'
       - name: Build AA Storybook
@@ -29,6 +30,6 @@ jobs:
       - name: Publish to AA Chromatic
         uses: chromaui/action@latest
         with:
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN_AA }}
+          projectToken: ${{ env.AA_TOKEN }}
           storybookBuildDir: dist/storybook/angular-accelerator
           skip: 'dependabot/**'