diff --git a/.github/workflows/github_advanced_security.yml b/.github/workflows/codeql.yml
similarity index 90%
rename from .github/workflows/github_advanced_security.yml
rename to .github/workflows/codeql.yml
index 99052c01bfac0..2dd07042e7a0b 100644
--- a/.github/workflows/github_advanced_security.yml
+++ b/.github/workflows/codeql.yml
@@ -1,4 +1,4 @@
-name: GitHub Advanced Security
+name: CodeQL
 on: [push, pull_request]
 jobs:
   analyze:
@@ -23,7 +23,7 @@ jobs:
         uses: github/codeql-action/init@v1
         with:
           languages: ${{ matrix.language }}
-          queries: security-extended
+          queries: security-and-quality
 
       - name: Autobuild CodeQL
         uses: github/codeql-action/autobuild@v1