diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba2e408d9..cf80e4aa3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -381,6 +381,8 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
+    # need to checkout otherwise paths-filter will fail on merge-queue trigger 
+    - uses: actions/checkout@v3
     - if: github.ref != 'refs/heads/main'
       uses: dorny/paths-filter@v2
       id: changes
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c73a855f3..917c194ce 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,8 +17,8 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]
-  merge_group:
-    branches: [ main ]
+    # known issue that codeql doesn't support merge_queue event, recommendation is to skip it on merge_queue
+    # https://github.com/github/codeql-action/issues/1572 and https://github.com/github/codeql-action/issues/1537
   schedule:
     - cron: '21 21 * * 5'