diff --git a/.github/codeql-cpp.yml b/.github/codeql-cpp.yml
new file mode 100644
index 000000000000..48e86cdc28a1
--- /dev/null
+++ b/.github/codeql-cpp.yml
@@ -0,0 +1,5 @@
+name: "Custom CodeQL Analysis"
+
+queries:
+  - uses: ./.github/codeql/custom-queries/cpp/redundantAssignment.ql
+  - uses: ./.github/codeql/openzfs-code-scanning.qls
diff --git a/.github/codeql-python.yml b/.github/codeql-python.yml
new file mode 100644
index 000000000000..93cb4a435ed9
--- /dev/null
+++ b/.github/codeql-python.yml
@@ -0,0 +1,4 @@
+name: "Custom CodeQL Analysis"
+
+paths-ignore:
+  - tests
diff --git a/.github/codeql/custom-queries/cpp/qlpack.yml b/.github/codeql/custom-queries/cpp/qlpack.yml
new file mode 100644
index 000000000000..cbe0f1cbe3c4
--- /dev/null
+++ b/.github/codeql/custom-queries/cpp/qlpack.yml
@@ -0,0 +1,4 @@
+name: openzfs-cpp-queries
+version: 0.0.0
+libraryPathDependencies: codeql-cpp
+suites: openzfs-cpp-suite
diff --git a/.github/codeql/custom-queries/cpp/redundantAssignment.ql b/.github/codeql/custom-queries/cpp/redundantAssignment.ql
new file mode 100644
index 000000000000..37876aa15012
--- /dev/null
+++ b/.github/codeql/custom-queries/cpp/redundantAssignment.ql
@@ -0,0 +1,18 @@
+import cpp
+
+from AssignExpr firstAssign, AssignExpr secondAssign
+where
+  // The first assignment is from 'a' to 'b'
+  firstAssign.getDest().(VarAccess).getTarget() = secondAssign.getSource().(VarAccess).getTarget() and
+  firstAssign.getSource().(VarAccess).getTarget() = secondAssign.getDest().(VarAccess).getTarget() and
+  // Ensure 'a' and 'b' are not modified in between these assignments
+  not exists(Expr anyExpr |
+    anyExpr.getEnclosingFunction() = firstAssign.getEnclosingFunction() and
+    anyExpr.isBetween(firstAssign, secondAssign) and
+    (
+      anyExpr.(AssignExpr).getDest().(VarAccess).getTarget() = firstAssign.getDest().(VarAccess).getTarget() or
+      anyExpr.(AssignExpr).getDest().(VarAccess).getTarget() = firstAssign.getSource().(VarAccess).getTarget()
+    )
+  )
+select secondAssign, "This assignment is redundant."
+
diff --git a/.github/codeql/openzfs-code-scanning.qls b/.github/codeql/openzfs-code-scanning.qls
new file mode 100644
index 000000000000..c371ed848cf8
--- /dev/null
+++ b/.github/codeql/openzfs-code-scanning.qls
@@ -0,0 +1,3 @@
+# Reusing existing QL Pack
+- import: codeql-suites/cpp-code-scanning.qls
+  from: codeql-cpp
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 037f8aca0eaa..7ccfc1492564 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -29,6 +29,7 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
+        config-file: .github/codeql-${{ matrix.language }}.yml
         languages: ${{ matrix.language }}
 
     - name: Autobuild