diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index 3e27c2fb0d..a51db141eb 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -25,6 +25,5 @@ queries:
 query-filters:
 - exclude:
     problem.severity:
-      - error
       - warning
       - recommendation
diff --git a/.github/codeql/edk2.qls b/.github/codeql/edk2.qls
index 0efc7dca52..ef9aae790f 100644
--- a/.github/codeql/edk2.qls
+++ b/.github/codeql/edk2.qls
@@ -9,4 +9,6 @@
 # Enable individual queries below.
 
 - include:
-    id: cpp/conditionallyuninitializedvariable
+    id: cpp/infinite-loop-with-unsatisfiable-exit-condition
+- include:
+    id: cpp/overflow-buffer