diff --git a/.github/workflows/check-change-note.yml b/.github/workflows/check-change-note.yml
index 5701e751923..9324b794654 100644
--- a/.github/workflows/check-change-note.yml
+++ b/.github/workflows/check-change-note.yml
@@ -8,6 +8,7 @@ on:
       - "*/ql/src/**/*.qll"
       - "!**/experimental/**"
       - "!ql/**"
+      - ".github/workflows/check-change-not.yml"
 
 jobs:
   check-change-note:
diff --git a/.github/workflows/validate-change-notes.yml b/.github/workflows/validate-change-notes.yml
new file mode 100644
index 00000000000..b8c59c792c5
--- /dev/null
+++ b/.github/workflows/validate-change-notes.yml
@@ -0,0 +1,31 @@
+name: Validate change notes
+
+on:
+  push:
+    paths:
+      - "*/ql/*/change-notes/**/*"
+      - ".github/workflows/validate-change-notes.yml"
+    branches:
+      - main
+      - "rc/*"
+  pull_request:
+    paths:
+      - "*/ql/*/change-notes/**/*"
+      - ".github/workflows/validate-change-notes.yml"
+
+jobs:
+  check-change-note:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup CodeQL
+        uses: ./.github/actions/fetch-codeql
+
+      - name: Fail if there are any errors with existing change notes
+        if: |
+          github.event.pull_request.draft == false
+
+        run: |
+          codeql pack release --groups cpp,csharp,java,javascript,python,ruby,-examples,-test,-experimental