diff --git a/.github/workflows/codeql-cfe-build.yml b/.github/workflows/codeql-cfe-build.yml
index a0d6db0f2..793e88978 100644
--- a/.github/workflows/codeql-cfe-build.yml
+++ b/.github/workflows/codeql-cfe-build.yml
@@ -7,8 +7,9 @@ on:
 jobs:
   codeql:
     name: CodeQl Analysis
-    uses: nasa/cFS/.github/workflows/codeql-build.yml@main
+    uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
     with: 
-      make-prep: 'make prep'
       make: 'make -j native/default_cpu1/osal/'
-      tests: '(cd build/native/default_cpu1/osal && make test)'
\ No newline at end of file
+      component-path: osal
+      test: true
+      
\ No newline at end of file
diff --git a/.github/workflows/codeql-osal-default.yml b/.github/workflows/codeql-osal-default.yml
index 0509f7280..cc2d16937 100644
--- a/.github/workflows/codeql-osal-default.yml
+++ b/.github/workflows/codeql-osal-default.yml
@@ -11,4 +11,5 @@ jobs:
     with: 
       setup: 'cd osal && cp Makefile.sample Makefile'
       make-prep: 'cd osal && make prep'
-      make: 'cd osal && make -j'
\ No newline at end of file
+      make: 'cd osal && make -j'
+      
\ No newline at end of file