diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4c0796baa..f708ecbd6b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -166,6 +166,7 @@ jobs:
             version: ${{ github.ref }}
             directory: ${{ github.event.pull_request.number }}
             pull-request-number: ${{ github.event.pull_request.number }}
+            deploy-repository: ${{ case(github.event_name == 'pull_request', 'core-ds/deploy-core-components', github.repository) }}
 
     screenshot-test:
         needs: demo
diff --git a/.github/workflows/pull-request-deploy-demo.yml b/.github/workflows/pull-request-deploy-demo.yml
index c2e05161bf..75c4df0460 100644
--- a/.github/workflows/pull-request-deploy-demo.yml
+++ b/.github/workflows/pull-request-deploy-demo.yml
@@ -33,7 +33,6 @@ jobs:
                       const data = JSON.parse(content);
 
                       core.setOutput('number', data.number);
-                      core.setOutput('repository', data.head.repo.full_name);
                       core.setOutput('sha', data.head.sha);
 
     deploy:
@@ -44,5 +43,5 @@ jobs:
         with:
             version: ${{ needs.pull-request.outputs.sha }}
             directory: ${{ needs.pull-request.outputs.number }}
-            deploy-repository: ${{ needs.pull-request.outputs.repository }}
+            deploy-repository: 'core-ds/deploy-core-components'
             pull-request-number: ${{ needs.pull-request.outputs.number }}
diff --git a/.github/workflows/remove-demo.yml b/.github/workflows/remove-demo.yml
index 1a0ae05fce..7e89e9b365 100644
--- a/.github/workflows/remove-demo.yml
+++ b/.github/workflows/remove-demo.yml
@@ -78,7 +78,7 @@ jobs:
               id: repository
               uses: core-ds/core-components/.github/actions/parse-repository@master
               with:
-                  repository: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.repo.full_name, github.repository) }}
+                  repository: ${{ case(github.event_name == 'pull_request', 'core-ds/deploy-core-components', github.repository) }}
 
             - name: Generate app token
               id: generate-token