diff --git a/.github/workflows/compile_card_db.yml b/.github/workflows/compile_card_db.yml
index b34b1c9..0f5ad64 100644
--- a/.github/workflows/compile_card_db.yml
+++ b/.github/workflows/compile_card_db.yml
@@ -1,6 +1,6 @@
 name: Compile Card DB
 
-on: [pull_request_target, workflow_dispatch]
+on: [pull_request, workflow_dispatch]
 
 jobs:
   compile_card_db:
@@ -15,12 +15,16 @@ jobs:
           pip install .
       - name: Update Languages
         run: doit update_languages
-      - name: Make PR
-        uses: peter-evans/create-pull-request@v3
+      - uses: dorny/paths-filter@v2
+        id: filter
         with:
-          base: ${{ github.head_ref }}
-          body: |
-            Auto-generate package card DB to from source card DB
-          delete-branch: true
-          reviewers: sumpfork
-          assignees: sumpfork
+          base: HEAD
+          filters: |
+            cardb_target:
+              - src/domdiv/card_db/**
+      - name: Create Artifact
+        uses: actions/upload-artifact@v2
+        if: steps.filter.outputs.cardb_target == 'true'
+        with:
+          name: card_db
+          path: src/domdiv/card_db/
diff --git a/.github/workflows/make_card_db_pr.yml b/.github/workflows/make_card_db_pr.yml
new file mode 100644
index 0000000..e5f5df5
--- /dev/null
+++ b/.github/workflows/make_card_db_pr.yml
@@ -0,0 +1,43 @@
+name: Make Card DB PR
+
+on:
+  workflow_run:
+    workflows: ["Compile Card DB"]
+    types:
+      -completed
+
+jobs:
+  make_pr:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            var artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "card_db"
+            })[0];
+            var download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/card_db.zip', Buffer.from(download.data));
+      - run: unzip -d src/domdiv/card_db card_db.zip
+      - run: rm -f card_db.zip
+      - name: Make PR
+        uses: peter-evans/create-pull-request@v3
+        with:
+          body: |
+            Auto-generate package card DB to from source card DB
+          delete-branch: true
+          reviewers: sumpfork
+          assignees: sumpfork