diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index 6317a13c7..05f4ec4fd 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -2,7 +2,7 @@ name: "CodeQL Config"
 
 paths-ignore:
   # Ignore template files - these are boilerplate code that shouldn't be analyzed
-  - "lib/crewai/src/crewai/cli/templates/**"
+  - "lib/cli/src/crewai_cli/templates/**"
   # Ignore test cassettes - these are test fixtures/recordings
   - "lib/crewai/tests/cassettes/**"
   - "lib/crewai-tools/tests/cassettes/**"
@@ -18,12 +18,16 @@ paths:
   - ".github/workflows/**"
   - ".github/actions/**"
   # Include all Python source code from workspace packages
+  - "lib/cli/src/**"
   - "lib/crewai/src/**"
+  - "lib/crewai-core/src/**"
   - "lib/crewai-tools/src/**"
   - "lib/crewai-files/src/**"
   - "lib/devtools/src/**"
   # Include tests (but exclude cassettes via paths-ignore)
+  - "lib/cli/tests/**"
   - "lib/crewai/tests/**"
+  - "lib/crewai-core/tests/**"
   - "lib/crewai-tools/tests/**"
   - "lib/crewai-files/tests/**"
   - "lib/devtools/tests/**"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b786dd215..835c69734 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -15,11 +15,11 @@ on:
   push:
     branches: [ "main" ]
     paths-ignore:
-      - "lib/crewai/src/crewai/cli/templates/**"
+      - "lib/cli/src/crewai_cli/templates/**"
   pull_request:
     branches: [ "main" ]
     paths-ignore:
-      - "lib/crewai/src/crewai/cli/templates/**"
+      - "lib/cli/src/crewai_cli/templates/**"
 
 jobs:
   analyze: