diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 432564a..77c7938 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,10 +2,24 @@ name: "Perform CodeQL Analysis"
 
 on:
   push:
-    branches: [ "current", sagitta", "equuleus", "circinus" ]
+    branches:
+      - current
+      - circinus
+      - sagitta
+    paths:
+      - '**'
+      - '!.github/**'
+      - '!**/*.md'
   pull_request_target:
     # The branches below must be a subset of the branches above
-    branches: [ "current" ]
+    branches:
+      - current
+      - circinus
+      - sagitta
+    paths:
+      - '**'
+      - '!.github/**'
+      - '!**/*.md'
   schedule:
     - cron: '22 10 * * 0'
 
diff --git a/.github/workflows/trigger-rebuild-repo-package.yml b/.github/workflows/trigger-rebuild-repo-package.yml
index 9d630bc..e26669b 100644
--- a/.github/workflows/trigger-rebuild-repo-package.yml
+++ b/.github/workflows/trigger-rebuild-repo-package.yml
@@ -25,7 +25,7 @@ jobs:
     needs: get_repo_name
     uses: vyos/.github/.github/workflows/trigger-rebuild-repo-package.yml@current
     with:
-      branch: ${{ github.ref_name }}
+      branch: ${{ github.event.pull_request.base.ref }}
       package_name: ${{ needs.get_repo_name.outputs.PACKAGE_NAME }}
     secrets:
       REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}