diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 65d56a286..b946a8b7f 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -39,7 +39,7 @@ jobs:
         if: ${{matrix.cppcheck =='cfe'}}
         run: |
           cd ${{matrix.cppcheck}}
-          cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./fsw/cfe-core/src ./modules 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
+          cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
 
       - name: osal strict cppcheck
         if: ${{matrix.cppcheck =='osal'}}
diff --git a/apps/ci_lab b/apps/ci_lab
index 96dd9869a..e35bbec5d 160000
--- a/apps/ci_lab
+++ b/apps/ci_lab
@@ -1 +1 @@
-Subproject commit 96dd9869a4ad7cb5069ac50382ddb53d36f8d653
+Subproject commit e35bbec5d9dae0a83a870dd65b1c0f77b8af201e
diff --git a/apps/to_lab b/apps/to_lab
index d91d44c6f..d6e0a7750 160000
--- a/apps/to_lab
+++ b/apps/to_lab
@@ -1 +1 @@
-Subproject commit d91d44c6fd44ccb20f72feb2e67a3dd4f4104fcd
+Subproject commit d6e0a775077be43b5b569d8c7e2d39eb42b25bd8
diff --git a/cfe b/cfe
index 178fbadf9..c0fc43add 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit 178fbadf9c8be4ded85dd1a65a34aa610eafb18e
+Subproject commit c0fc43addd399dbf639f25878db0407cb08a4f28
diff --git a/psp b/psp
index 215807e7f..10c8b390c 160000
--- a/psp
+++ b/psp
@@ -1 +1 @@
-Subproject commit 215807e7f761cb8fe6fb392089559619b2c67507
+Subproject commit 10c8b390cfe3c135ef2f6b825f5597239ffdf4a3