diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 6d8a1d985d..0137fe75de 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -43,7 +43,7 @@ jobs:
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
-          # queries: ./codeql/
+          queries: ./codeql/
       - name: Autobuild
         uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
diff --git a/codeql/acn-addipamconfig.ql b/codeql/acn-addipamconfig.ql
index 1a18cb75ed..7a4c05ee87 100644
--- a/codeql/acn-addipamconfig.ql
+++ b/codeql/acn-addipamconfig.ql
@@ -13,7 +13,7 @@
 import go
 import lib.ACN
 
-private class Source extends DataFlow2::Node {
+private class Source extends DataFlow::Node {
   Source() {
     exists(DataFlow::CallNode c, Method m |
       //m.hasQualifiedName("github.com/Azure/azure-container-networking/cni/network", "NetPlugin",
diff --git a/codeql/acn-cni-args.ql b/codeql/acn-cni-args.ql
index edb9b5a429..0deb372d3c 100644
--- a/codeql/acn-cni-args.ql
+++ b/codeql/acn-cni-args.ql
@@ -13,7 +13,7 @@
 import go
 import lib.ACN
 
-private class Source extends DataFlow2::Node {
+private class Source extends DataFlow::Node {
   Source() {
     exists(DataFlow::CallNode c, Method m |
       (
diff --git a/codeql/acn-cns-invoker.ql b/codeql/acn-cns-invoker.ql
index ef3c053f7a..c543893a2e 100644
--- a/codeql/acn-cns-invoker.ql
+++ b/codeql/acn-cns-invoker.ql
@@ -14,7 +14,7 @@
 import go
 import lib.ACN
 
-private class Source extends DataFlow2::Node {
+private class Source extends DataFlow::Node {
   Source() {
     exists(DataFlow::CallNode c, Method m |
       (
diff --git a/codeql/acn-decode.ql b/codeql/acn-decode.ql
index d37ded6a5f..ff6f5a789d 100644
--- a/codeql/acn-decode.ql
+++ b/codeql/acn-decode.ql
@@ -13,7 +13,7 @@
 import go
 import lib.ACN
 
-private class Source extends DataFlow2::Node {
+private class Source extends DataFlow::Node {
   Source() {
     exists(DataFlow::CallNode c |
       c.getTarget().hasQualifiedName("github.com/Azure/azure-container-networking/common", "Decode") and
diff --git a/codeql/lib/ACN.qll b/codeql/lib/ACN.qll
index e3553112d1..e1a2a2ff47 100644
--- a/codeql/lib/ACN.qll
+++ b/codeql/lib/ACN.qll
@@ -1,7 +1,7 @@
 import go
 
 module ACN {
-  class CommandSink extends DataFlow2::Node {
+  class CommandSink extends DataFlow::Node {
     CommandSink() {
       exists(DataFlow::CallNode c, Method m |
         (