diff --git a/c/cert/src/codeql-pack.lock.yml b/c/cert/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/c/cert/src/codeql-pack.lock.yml
+++ b/c/cert/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index cff1e79631..f79744a4fc 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -6,4 +6,4 @@ license: MIT
 default-suite-file: codeql-suites/cert-c-default.qls
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql b/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql
index 8c25fe3350..3811d4e417 100644
--- a/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql
+++ b/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql
@@ -24,28 +24,32 @@ import codingstandards.c.cert
 import codingstandards.cpp.types.Compatible
 import ExternalIdentifiers
 
-predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+predicate interestedInFunctions(
+  FunctionDeclarationEntry f1, FunctionDeclarationEntry f2, ExternalIdentifiers d
+) {
   not f1 = f2 and
-  f1.getDeclaration() = f2.getDeclaration() and
-  f1.getName() = f2.getName()
+  d = f1.getDeclaration() and
+  d = f2.getDeclaration()
+}
+
+predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+  interestedInFunctions(f1, f2, _)
 }
 
+module FuncDeclEquiv =
+  FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>;
+
 from ExternalIdentifiers d, FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
 where
   not isExcluded(f1, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
   not isExcluded(f2, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
-  not f1 = f2 and
-  f1.getDeclaration() = d and
-  f2.getDeclaration() = d and
-  f1.getName() = f2.getName() and
+  interestedInFunctions(f1, f2, d) and
   (
     //return type check
-    not FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>::equalReturnTypes(f1,
-      f2)
+    not FuncDeclEquiv::equalReturnTypes(f1, f2)
     or
     //parameter type check
-    not FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>::equalParameterTypes(f1,
-      f2)
+    not FuncDeclEquiv::equalParameterTypes(f1, f2)
   ) and
   // Apply ordering on start line, trying to avoid the optimiser applying this join too early
   // in the pipeline
diff --git a/c/cert/src/rules/EXP16-C/DoNotCompareFunctionPointersToConstantValues.ql b/c/cert/src/rules/EXP16-C/DoNotCompareFunctionPointersToConstantValues.ql
index e65d58a652..5f347d817a 100644
--- a/c/cert/src/rules/EXP16-C/DoNotCompareFunctionPointersToConstantValues.ql
+++ b/c/cert/src/rules/EXP16-C/DoNotCompareFunctionPointersToConstantValues.ql
@@ -23,13 +23,17 @@ import codingstandards.cpp.types.FunctionType
 import codingstandards.cpp.exprs.FunctionExprs
 import codingstandards.cpp.exprs.Guards
 
-abstract class EffectivelyComparison extends Element {
+final class FinalElement = Element;
+
+abstract class EffectivelyComparison extends FinalElement {
   abstract string getExplanation();
 
   abstract FunctionExpr getFunctionExpr();
 }
 
-class ExplicitComparison extends EffectivelyComparison, ComparisonOperation {
+final class FinalComparisonOperation = ComparisonOperation;
+
+class ExplicitComparison extends EffectivelyComparison, FinalComparisonOperation {
   Expr constantExpr;
   FunctionExpr funcExpr;
 
diff --git a/c/cert/test/codeql-pack.lock.yml b/c/cert/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/c/cert/test/codeql-pack.lock.yml
+++ b/c/cert/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/c/common/src/codeql-pack.lock.yml b/c/common/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/c/common/src/codeql-pack.lock.yml
+++ b/c/common/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 39adc407b9..068e7c3f2f 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -3,4 +3,4 @@ version: 2.49.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/c/common/test/codeql-pack.lock.yml b/c/common/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/c/common/test/codeql-pack.lock.yml
+++ b/c/common/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/c/misra/src/codeql-pack.lock.yml b/c/misra/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/c/misra/src/codeql-pack.lock.yml
+++ b/c/misra/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 613cb22b26..8b98f26fb0 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -6,4 +6,4 @@ license: MIT
 default-suite-file: codeql-suites/misra-c-default.qls
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql b/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql
index 88b0a5b05a..9ad460068b 100644
--- a/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql
@@ -32,5 +32,5 @@ where
   // `isInMacroExpansion` is broken for `UserType`s.
   not s.isInMacroExpansion() and
   // Exclude template parameters, in case this is run on C++ code.
-  not s instanceof TemplateParameter
+  not s instanceof TypeTemplateParameter
 select s, "struct " + s.getName() + " has an unused tag."
diff --git a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
index 87c945d6b6..1fe052aaae 100644
--- a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
@@ -20,6 +20,7 @@ predicate matchesSign(IntegerConstantMacro macro, PossiblyNegativeLiteral litera
   literal.isNegative() implies macro.isSigned()
 }
 
+bindingset[literal]
 predicate matchesSize(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
   literal.getRawValue() <= macro.maxValue() and
   literal.getRawValue() >= macro.minValue()
diff --git a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql
index 73abc1e048..e7eba7e42a 100644
--- a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql
+++ b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql
@@ -23,13 +23,14 @@ predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclaration
   f1.getDeclaration() instanceof ExternalIdentifiers and
   f1.isDefinition() and
   f1.getDeclaration() = f2.getDeclaration() and
-  // This condition should always hold, but removing it affects join order performance.
-  f1.getName() = f2.getName() and
   not f2.isDefinition() and
   not f1.isFromTemplateInstantiation(_) and
   not f2.isFromTemplateInstantiation(_)
 }
 
+module FunDeclEquiv =
+  FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>;
+
 from FunctionDeclarationEntry f1
 where
   not isExcluded(f1, Declarations4Package::compatibleDeclarationFunctionDefinedQuery()) and
@@ -44,17 +45,13 @@ where
     or
     //or one exists that is close but incompatible in some way
     exists(FunctionDeclarationEntry f2 |
-      f1.getName() = f2.getName() and
-      not f2.isDefinition() and
-      f2.getDeclaration() = f1.getDeclaration() and
+      interestedInFunctions(f1, f2) and
       (
         //return types differ
-        not FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>::equalReturnTypes(f1,
-          f2)
+        not FunDeclEquiv::equalReturnTypes(f1, f2)
         or
         //parameter types differ
-        not FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>::equalParameterTypes(f1,
-          f2)
+        not FunDeclEquiv::equalParameterTypes(f1, f2)
         or
         //parameter names differ
         parameterNamesUnmatched(f1, f2)
diff --git a/c/misra/test/codeql-pack.lock.yml b/c/misra/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/c/misra/test/codeql-pack.lock.yml
+++ b/c/misra/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/change_notes/2025-7-15-fix-performance-issues-in-2.20.7.md b/change_notes/2025-7-15-fix-performance-issues-in-2.20.7.md
new file mode 100644
index 0000000000..a936579a97
--- /dev/null
+++ b/change_notes/2025-7-15-fix-performance-issues-in-2.20.7.md
@@ -0,0 +1,4 @@
+ - `DCL40-C`, `RULE-8-4`: `IncompatibleFunctionDeclarations.ql`, `CompatibleDeclarationFunctionDefined.ql`.
+   - Fixed performance issues introduced when upgrading to CodeQL `2.20.7` by removing unnecessary check that matching function declarations have matching names.
+ - `RULE-7-5`: `IncorrectlySizedIntegerConstantMacroArgument.ql`.
+   - Added a `bindingset` to improve performance when checking if a literal matches the size of an integer constant macro.
\ No newline at end of file
diff --git a/cpp/autosar/src/codeql-pack.lock.yml b/cpp/autosar/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/autosar/src/codeql-pack.lock.yml
+++ b/cpp/autosar/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 4130f08079..6c763ef633 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
index 1ae2bc87ab..7b31ae5d9e 100644
--- a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
+++ b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
@@ -18,7 +18,8 @@ import codingstandards.cpp.FunctionEquivalence
 
 class Candidate extends TemplateFunction {
   Candidate() {
-    this.getAParameter().getType().(RValueReferenceType).getBaseType() instanceof TemplateParameter
+    this.getAParameter().getType().(RValueReferenceType).getBaseType() instanceof
+      TypeTemplateParameter
   }
 }
 
diff --git a/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql b/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
index 61b00ba852..a8fb1ace66 100644
--- a/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
+++ b/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
@@ -18,7 +18,7 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.types.Uses
 import codingstandards.cpp.Operator
 
-predicate templateDefinitionMentionsTypeParameter(Declaration d, TemplateParameter tp) {
+predicate templateDefinitionMentionsTypeParameter(Declaration d, TypeTemplateParameter tp) {
   exists(Type t |
     (
       // direct reference, e.g., fields.
@@ -50,36 +50,36 @@ predicate templateDefinitionMentionsTypeParameter(Declaration d, TemplateParamet
 }
 
 /**
- * The set of `TemplateParameter` references within an `Enum`.
+ * The set of `TypeTemplateParameter` references within an `Enum`.
  */
-TemplateParameter enumTemplateReferences(Enum e) {
+TypeTemplateParameter enumTemplateReferences(Enum e) {
   templateDefinitionMentionsTypeParameter(e.getADeclaration(), result)
   or
   result = e.getExplicitUnderlyingType()
 }
 
 /**
- * The set of `TemplateParameter` references within an `Class`.
+ * The set of `TypeTemplateParameter` references within an `Class`.
  */
-TemplateParameter classTemplateReferences(Class c) {
+TypeTemplateParameter classTemplateReferences(Class c) {
   templateDefinitionMentionsTypeParameter(c.getAMember(), result)
   or
   c.getADerivation().getBaseType() = result
 }
 
 /**
- * The set of all of the `TemplateParameter`s referenced by a `EnumConstant`.
+ * The set of all of the `TypeTemplateParameter`s referenced by a `EnumConstant`.
  */
-TemplateParameter enumConstantTemplateReferences(EnumConstant ec) {
+TypeTemplateParameter enumConstantTemplateReferences(EnumConstant ec) {
   templateDefinitionMentionsTypeParameter(ec.getDeclaringType(), result)
 }
 
 /**
- * The set of all `TemplateParameter`s referenced by a `Function`.
+ * The set of all `TypeTemplateParameter`s referenced by a `Function`.
  */
-TemplateParameter functionTemplateReferences(Function mf) {
+TypeTemplateParameter functionTemplateReferences(Function mf) {
   // the type of the function
-  exists(TemplateParameter tp |
+  exists(TypeTemplateParameter tp |
     result = tp and
     (
       mf.getType().refersTo(result)
@@ -115,10 +115,10 @@ TemplateParameter functionTemplateReferences(Function mf) {
 }
 
 /**
- * The set of all `TemplateParameters` available as arguments to the declaring
+ * The set of all `TypeTemplateParameters` available as arguments to the declaring
  * element of some `Declarations`.
  */
-TemplateParameter templateParametersOfDeclaringTemplateClass(Declaration d) {
+TypeTemplateParameter templateParametersOfDeclaringTemplateClass(Declaration d) {
   result = d.getDeclaringType().getATemplateArgument()
 }
 
@@ -149,7 +149,7 @@ where
   not d instanceof UserNegationOperator and
   // for each declaration within a template class get the
   // template parameters of the declaring class
-  not exists(TemplateParameter t |
+  not exists(TypeTemplateParameter t |
     t = templateParametersOfDeclaringTemplateClass(d) and
     // and require that the declaration depends on at least
     // one of those template parameters.
@@ -170,7 +170,7 @@ where
   ) and
   // Omit using alias (cf. https://github.com/github/codeql-coding-standards/issues/739)
   // Exclude Using alias which refer directly to a TypeParameter
-  not d.(UsingAliasTypedefType).getBaseType() instanceof TemplateParameter
+  not d.(UsingAliasTypedefType).getBaseType() instanceof TypeTemplateParameter
 select d,
   "Member " + d.getName() + " template class does not use any of template arguments of its $@.",
   d.getDeclaringType(), "declaring type"
diff --git a/cpp/autosar/src/rules/A14-5-3/NonMemberGenericOperatorCondition.ql b/cpp/autosar/src/rules/A14-5-3/NonMemberGenericOperatorCondition.ql
index a2211368ed..c2d28d3ef9 100644
--- a/cpp/autosar/src/rules/A14-5-3/NonMemberGenericOperatorCondition.ql
+++ b/cpp/autosar/src/rules/A14-5-3/NonMemberGenericOperatorCondition.ql
@@ -18,7 +18,7 @@ import codingstandards.cpp.autosar
 class NonMemberGenericOperator extends TemplateFunction {
   NonMemberGenericOperator() {
     this instanceof Operator and
-    exists(TemplateParameter tp, Type pType |
+    exists(TypeTemplateParameter tp, Type pType |
       pType = getAParameter().getType().getUnspecifiedType() //Parameter Type
     |
       pType = tp or
diff --git a/cpp/autosar/src/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.ql b/cpp/autosar/src/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.ql
index e04bb89cfa..79e17305fb 100644
--- a/cpp/autosar/src/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.ql
+++ b/cpp/autosar/src/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.ql
@@ -22,7 +22,7 @@ class CandidateVariable extends Variable {
     isStatic() and
     not this instanceof MemberVariable and
     //exclude partially specialized template variables
-    not exists(TemplateVariable v | this = v.getAnInstantiation())
+    not this.isSpecialization()
   }
 }
 
diff --git a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
index f2dd0dc8bc..020d1d4ee1 100644
--- a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
+++ b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
@@ -65,30 +65,46 @@ class DocumentableDeclaration extends Declaration {
   string declarationType;
 
   DocumentableDeclaration() {
-    this instanceof UserType and
-    declarationType = "user-defined type" and
-    // Exclude template parameter types.
-    not this.(UserType).involvesTemplateParameter()
-    or
-    this instanceof Function and
-    declarationType = "function" and
-    // Exclude compiler generated functions, which cannot reasonably be documented.
-    not this.(Function).isCompilerGenerated() and
-    // Exclude instantiated template functions, which cannot reasonably be documented.
-    not this.(Function).isFromTemplateInstantiation(_) and
-    // Exclude anonymous lambda functions.
-    not exists(LambdaExpression lc | lc.getLambdaFunction() = this) and
-    //Exclude friend functions (because they have 2 entries in the database), and only one shows documented truly
-    not exists(FriendDecl d |
-      d.getFriend().(Function).getDefinition() = this.getADeclarationEntry()
+    // Within the users codebase, not a system header
+    exists(this.getFile().getRelativePath()) and
+    // Not required to be documented, as used within same scope
+    not isInFunctionScope(this) and
+    (
+      this instanceof UserType and
+      declarationType = "user-defined type" and
+      // Exclude template parameter types.
+      not this.(UserType).involvesTemplateParameter()
+      or
+      this instanceof Function and
+      declarationType = "function" and
+      // Exclude compiler generated functions, which cannot reasonably be documented.
+      not this.(Function).isCompilerGenerated() and
+      // Exclude instantiated template functions, which cannot reasonably be documented.
+      not this.(Function).isFromTemplateInstantiation(_) and
+      // Exclude anonymous lambda functions.
+      not exists(LambdaExpression lc | lc.getLambdaFunction() = this) and
+      //Exclude friend functions (because they have 2 entries in the database), and only one shows documented truly
+      not exists(FriendDecl d |
+        d.getFriend().(Function).getDefinition() = this.getADeclarationEntry()
+      )
+      or
+      this instanceof MemberVariable and
+      declarationType = "member variable" and
+      // Exclude memeber variables in instantiated templates, which cannot reasonably be documented.
+      not this.(MemberVariable).isFromTemplateInstantiation(_) and
+      // Exclude compiler generated variables, such as those for anonymous lambda functions
+      not this.(MemberVariable).isCompilerGenerated()
     )
-    or
-    this instanceof MemberVariable and
-    declarationType = "member variable" and
-    // Exclude memeber variables in instantiated templates, which cannot reasonably be documented.
-    not this.(MemberVariable).isFromTemplateInstantiation(_) and
-    // Exclude compiler generated variables, such as those for anonymous lambda functions
-    not this.(MemberVariable).isCompilerGenerated()
+  }
+
+  private predicate hasDocumentedDefinition() {
+    // Check if the declaration has a documented definition
+    exists(DeclarationEntry de | de = getADeclarationEntry() and isDocumented(de))
+  }
+
+  private predicate hasOnlyDefinitions() {
+    // Check if the declaration has only definitions, i.e., no non-definition entries
+    not exists(DeclarationEntry de | de = getADeclarationEntry() and not de.isDefinition())
   }
 
   /** Gets a `DeclarationEntry` for this declaration that should be documented. */
@@ -96,20 +112,16 @@ class DocumentableDeclaration extends Declaration {
     // Find a declaration entry that is not documented
     result = getADeclarationEntry() and
     not isDocumented(result) and
-    (
-      // Report any non definition DeclarationEntry that is not documented
-      // as long as there is no corresponding documented definition (which must be for a forward declaration)
-      not result.isDefinition() and
-      not exists(DeclarationEntry de |
-        de = getADeclarationEntry() and de.isDefinition() and isDocumented(de)
-      )
-      or
+    if result.isDefinition()
+    then
       // Report the definition DeclarationEntry, only if there are no non-definition `DeclarationEntry`'s
       // The rationale here is that documenting both the non-definition and definition declaration entries
       // is redundant
-      result.isDefinition() and
-      not exists(DeclarationEntry de | de = getADeclarationEntry() and not de.isDefinition())
-    )
+      hasOnlyDefinitions()
+    else
+      // Report any non definition DeclarationEntry that is not documented
+      // as long as there is no corresponding documented definition (which must be for a forward declaration)
+      not hasDocumentedDefinition()
   }
 
   /** Gets a string describing the type of declaration. */
@@ -144,7 +156,6 @@ from DocumentableDeclaration d, DeclarationEntry de
 where
   not isExcluded(de, CommentsPackage::undocumentedUserDefinedTypeQuery()) and
   not isExcluded(d, CommentsPackage::undocumentedUserDefinedTypeQuery()) and
-  not isInFunctionScope(d) and
   d.getAnUndocumentedDeclarationEntry() = de
 select de,
   "Declaration entry for " + d.getDeclarationType() + " " + d.getName() +
diff --git a/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql b/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
index 89aca8048e..addd8af697 100644
--- a/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
+++ b/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
@@ -23,7 +23,7 @@ class UniqueLineStmt extends Locatable {
       exists(Declaration d |
         this = d.getADeclarationEntry() and
         not d instanceof Parameter and
-        not d instanceof TemplateParameter and
+        not d instanceof TypeTemplateParameter and
         // TODO - Needs to be enhanced to solve issues with
         // templated inner classes.
         not d instanceof Function and
@@ -55,11 +55,9 @@ where
   //omit the cases where there is one struct identifier on a struct var line used with typedef
   not exists(Struct s | s.getADeclarationEntry() = e1 and e1 instanceof TypeDeclarationEntry) and
   not exists(Struct s | s.getATypeNameUse() = e1 and e1 instanceof TypeDeclarationEntry) and
-  exists(Location l1, Location l2 |
-    e1.getLocation() = l1 and
-    e2.getLocation() = l2 and
-    not l1 = l2 and
-    l1.getFile() = l2.getFile() and
-    l1.getStartLine() = l2.getStartLine()
+  exists(string file, int startline |
+    e1.getLocation().hasLocationInfo(file, startline, _, _, _) and
+    e2.getLocation().hasLocationInfo(file, startline, _, _, _) and
+    not e1.getLocation() = e2.getLocation()
   )
 select e1, "Expression statement and identifier are on the same line."
diff --git a/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql b/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
index 05e99d6e66..1b41fe81bc 100644
--- a/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
+++ b/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
@@ -34,10 +34,10 @@ class TemplateAssignmentOperatorMember extends MemberFunction {
   }
 
   /**
-   * is a copy assigment operator candidate if it has only one param and form in [T, T&, const T&, volatile T&, const volatile T&]
+   * is a copy assignment operator candidate if it has only one param and form in [T, T&, const T&, volatile T&, const volatile T&]
    */
   predicate hasGenericCopyCompatibleParameter() {
-    exists(TemplateParameter tp, Type pType |
+    exists(TypeTemplateParameter tp, Type pType |
       pType = this.getAParameter().getType().getUnspecifiedType() and //Parameter Type
       (
         tp = pType //T
diff --git a/cpp/autosar/test/codeql-pack.lock.yml b/cpp/autosar/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/autosar/test/codeql-pack.lock.yml
+++ b/cpp/autosar/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/cert/src/codeql-pack.lock.yml b/cpp/cert/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/cert/src/codeql-pack.lock.yml
+++ b/cpp/cert/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index a89ed8a905..e842352f1c 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -5,5 +5,5 @@ suites: codeql-suites
 license: MIT
 default-suite-file: codeql-suites/cert-cpp-default.qls
 dependencies:
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
   codeql/common-cpp-coding-standards: '*'
diff --git a/cpp/cert/test/codeql-pack.lock.yml b/cpp/cert/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/cert/test/codeql-pack.lock.yml
+++ b/cpp/cert/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/common/src/codeql-pack.lock.yml b/cpp/common/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/common/src/codeql-pack.lock.yml
+++ b/cpp/common/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
index 87f27c134f..e54e4378e9 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
@@ -19,17 +19,17 @@ class RecursiveCall extends FunctionCall {
   }
 }
 
-query predicate problems(FunctionCall fc, string message, Function f, string f_name) {
-  exists(RecursiveCall call |
-    not isExcluded(call, getQuery()) and
-    f = fc.getTarget() and
-    f_name = fc.getTarget().getName() and
-    fc.getTarget() = call.getTarget() and
-    if fc.getTarget() = fc.getEnclosingFunction()
-    then message = "This call directly invokes its containing function $@."
-    else
-      message =
-        "The function " + fc.getEnclosingFunction() +
-          " is indirectly recursive via this call to $@."
-  )
+class RecursiveFunction extends Function {
+  RecursiveFunction() { exists(RecursiveCall fc | fc.getEnclosingFunction() = this) }
+}
+
+query predicate problems(FunctionCall fc, string message, RecursiveFunction f, string functionName) {
+  not isExcluded(fc, getQuery()) and
+  f = fc.getTarget() and
+  functionName = f.getName() and
+  if f = fc.getEnclosingFunction()
+  then message = "This call directly invokes its containing function $@."
+  else
+    message =
+      "The function " + fc.getEnclosingFunction() + " is indirectly recursive via this call to $@."
 }
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 07a8dc4136..8b60314b91 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -2,6 +2,6 @@ name: codeql/common-cpp-coding-standards
 version: 2.49.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
 dataExtensions:
 - ext/*.model.yml
diff --git a/cpp/common/test/codeql-pack.lock.yml b/cpp/common/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/common/test/codeql-pack.lock.yml
+++ b/cpp/common/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/common/test/guideline_recategorizations/DisappliedQuery.ql b/cpp/common/test/guideline_recategorizations/DisappliedQuery.ql
index 58ba3239e0..aa2caa8ad2 100644
--- a/cpp/common/test/guideline_recategorizations/DisappliedQuery.ql
+++ b/cpp/common/test/guideline_recategorizations/DisappliedQuery.ql
@@ -17,7 +17,7 @@ from UserType ut, string reason
 where
   isExcluded(ut, DeadCodePackage::unusedTypeDeclarationsQuery(), reason) and
   exists(ut.getFile()) and
-  not ut instanceof TemplateParameter and
+  not ut instanceof TypeTemplateParameter and
   not ut instanceof ProxyClass and
   not exists(getATypeUse(ut)) and
   not ut.isFromUninstantiatedTemplate(_)
diff --git a/cpp/misra/src/codeql-pack.lock.yml b/cpp/misra/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/misra/src/codeql-pack.lock.yml
+++ b/cpp/misra/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 44baf3efbe..201291b135 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -5,4 +5,4 @@ default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/cpp/misra/test/codeql-pack.lock.yml b/cpp/misra/test/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/misra/test/codeql-pack.lock.yml
+++ b/cpp/misra/test/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/report/src/codeql-pack.lock.yml b/cpp/report/src/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/cpp/report/src/codeql-pack.lock.yml
+++ b/cpp/report/src/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index e563299482..1574721c0f 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/report-cpp-coding-standards
 version: 2.49.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/scripts/generate_modules/queries/codeql-pack.lock.yml b/scripts/generate_modules/queries/codeql-pack.lock.yml
index ab9a39f9c1..a45ea8f438 100644
--- a/scripts/generate_modules/queries/codeql-pack.lock.yml
+++ b/scripts/generate_modules/queries/codeql-pack.lock.yml
@@ -2,23 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 2.1.1
+    version: 4.0.3
   codeql/dataflow:
-    version: 1.1.6
+    version: 2.0.3
   codeql/mad:
-    version: 1.0.12
+    version: 1.0.19
   codeql/rangeanalysis:
-    version: 1.0.12
+    version: 1.0.19
   codeql/ssa:
-    version: 1.0.12
+    version: 1.0.19
   codeql/tutorial:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typeflow:
-    version: 1.0.12
+    version: 1.0.19
   codeql/typetracking:
-    version: 1.0.12
+    version: 2.0.3
   codeql/util:
-    version: 1.0.12
+    version: 2.0.6
   codeql/xml:
-    version: 1.0.12
+    version: 1.0.19
 compiled: false
diff --git a/scripts/generate_modules/queries/qlpack.yml b/scripts/generate_modules/queries/qlpack.yml
index d2c729dfb9..9aabee2562 100644
--- a/scripts/generate_modules/queries/qlpack.yml
+++ b/scripts/generate_modules/queries/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/standard-library-extraction-cpp-coding-standards
 version: 0.0.0
 license: MIT
 dependencies:
-  codeql/cpp-all: 2.1.1
+  codeql/cpp-all: 4.0.3
diff --git a/supported_codeql_configs.json b/supported_codeql_configs.json
index 77534bd53d..9b89dd849e 100644
--- a/supported_codeql_configs.json
+++ b/supported_codeql_configs.json
@@ -1,9 +1,9 @@
 {
   "supported_environment": [
     {
-      "codeql_cli": "2.19.4",
-      "codeql_standard_library": "codeql-cli/v2.19.4",
-      "codeql_cli_bundle": "codeql-bundle-v2.19.4"
+      "codeql_cli": "2.20.7",
+      "codeql_standard_library": "codeql-cli/v2.20.7",
+      "codeql_cli_bundle": "codeql-bundle-v2.20.7"
     }
   ],
   "supported_language": [