diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 28419fdf..f07d2018 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     fsw:
       runs-on: ubuntu-latest
       container:
-        image: ivvitc/nos3-64:dev
+        image: ivvitc/nos3-64:fprime
       steps:
         - uses: actions/checkout@v4
           with:
@@ -29,7 +29,7 @@ jobs:
     sim:
       runs-on: ubuntu-latest
       container:
-        image: ivvitc/nos3-64:dev
+        image: ivvitc/nos3-64:fprime
       steps:
         - uses: actions/checkout@v2
           with:
diff --git a/cfg/nos3_defs/targets.cmake b/cfg/nos3_defs/targets.cmake
index b670344d..ea878be0 100644
--- a/cfg/nos3_defs/targets.cmake
+++ b/cfg/nos3_defs/targets.cmake
@@ -103,35 +103,38 @@ list(APPEND MISSION_GLOBAL_APPLIST
     #
     # Components
     #
-        arducam/fsw
-        generic_adcs/fsw
-        generic_css/fsw
-        generic_eps/fsw
-        generic_fss/fsw
-        generic_imu/fsw
-        generic_mag/fsw
-        generic_reaction_wheel/fsw
-        generic_radio/fsw
-        generic_star_tracker/fsw
-        generic_torquer/fsw
-        novatel_oem615/fsw
-        sample/fsw
-        syn/fsw
+        arducam/fsw/cfs
+        generic_adcs/fsw/cfs
+        generic_css/fsw/cfs
+        generic_eps/fsw/cfs
+        generic_fss/fsw/cfs
+        generic_imu/fsw/cfs
+        generic_mag/fsw/cfs
+        generic_reaction_wheel/fsw/cfs
+        generic_radio/fsw/cfs
+        generic_star_tracker/fsw/cfs
+        generic_torquer/fsw/cfs
+        novatel_oem615/fsw/cfs
+        sample/fsw/cfs
+        syn/fsw/cfs
 )
 
 # Create Application Platform Include List
 FOREACH(X ${MISSION_GLOBAL_APPLIST})
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/mission_inc)
-    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/mission_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/mission_inc)
+
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/inc)
-    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/inc)
-    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/platform_inc)
-    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/platform_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/inc)
+
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/platform_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/platform_inc)
+
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/public_inc)
-    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/public_inc)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/public_inc)
+
     LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/src)
-    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/src)
+    LIST(APPEND APPLICATION_PLATFORM_INC_LIST ${${X}_MISSION_DIR}/fsw/cfs/src)
 ENDFOREACH(X)
 
 # FT_INSTALL_SUBDIR indicates where the black box test data files (lua scripts) should
diff --git a/components/arducam b/components/arducam
index 88e946d5..dd0c68c9 160000
--- a/components/arducam
+++ b/components/arducam
@@ -1 +1 @@
-Subproject commit 88e946d54da6e0ed5e2084fd46e8476ff473b3c2
+Subproject commit dd0c68c936bee7aed727f37fee905dda7adb2972
diff --git a/components/generic_adcs b/components/generic_adcs
index 2755e61e..74d847aa 160000
--- a/components/generic_adcs
+++ b/components/generic_adcs
@@ -1 +1 @@
-Subproject commit 2755e61e66d847aada2bce545e537ea5606d9e27
+Subproject commit 74d847aacc5ade2ed9cf25d76f28aa2016d335e9
diff --git a/components/generic_css b/components/generic_css
index 1bbba058..93e83712 160000
--- a/components/generic_css
+++ b/components/generic_css
@@ -1 +1 @@
-Subproject commit 1bbba058117e2c8a3bf17229a1102eab7a67bee4
+Subproject commit 93e837125a484c1a51b696a3e9be130a8a447918
diff --git a/components/generic_eps b/components/generic_eps
index 2c6d147e..881619b9 160000
--- a/components/generic_eps
+++ b/components/generic_eps
@@ -1 +1 @@
-Subproject commit 2c6d147eb6b7c4b6e43298ff8c4d743da9002d38
+Subproject commit 881619b9b25864c681aab1bad1da4ea246917458
diff --git a/components/generic_fss b/components/generic_fss
index a20aaa5f..0a1a3a89 160000
--- a/components/generic_fss
+++ b/components/generic_fss
@@ -1 +1 @@
-Subproject commit a20aaa5f0a4bd3c6ed9b76e088a172ac17f05847
+Subproject commit 0a1a3a896306ce7a934a645fc91cd12004a29666
diff --git a/components/generic_imu b/components/generic_imu
index 6d1058e3..222acfce 160000
--- a/components/generic_imu
+++ b/components/generic_imu
@@ -1 +1 @@
-Subproject commit 6d1058e370f09ead713f03a8cee10d308549059c
+Subproject commit 222acfce398adc5bfdc9648b1a809ced84128874
diff --git a/components/generic_mag b/components/generic_mag
index a67fdade..69d2ea72 160000
--- a/components/generic_mag
+++ b/components/generic_mag
@@ -1 +1 @@
-Subproject commit a67fdadea4663bebc308d88c974438c677aab8ba
+Subproject commit 69d2ea72d4f4c441a9e65e458568af16a133d9fd
diff --git a/components/generic_radio b/components/generic_radio
index 29e86d5a..795666d9 160000
--- a/components/generic_radio
+++ b/components/generic_radio
@@ -1 +1 @@
-Subproject commit 29e86d5aec46fbe39601b93fdc2574502363bb43
+Subproject commit 795666d97cae973f8f627e5a82905680fbb477dd
diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel
index 838cc687..df0db3fe 160000
--- a/components/generic_reaction_wheel
+++ b/components/generic_reaction_wheel
@@ -1 +1 @@
-Subproject commit 838cc687594bb77a5fa456c593c77c73edb7bf69
+Subproject commit df0db3febfad8892b4ccb05f310173399dd2fe0a
diff --git a/components/generic_star_tracker b/components/generic_star_tracker
index 4f0024af..8871b41a 160000
--- a/components/generic_star_tracker
+++ b/components/generic_star_tracker
@@ -1 +1 @@
-Subproject commit 4f0024af02baf600f0b0ed60f745ae2b7c41ad8e
+Subproject commit 8871b41a181386708cfd1fed15790208e453d6c9
diff --git a/components/generic_torquer b/components/generic_torquer
index fda1fb7c..fdb497b8 160000
--- a/components/generic_torquer
+++ b/components/generic_torquer
@@ -1 +1 @@
-Subproject commit fda1fb7c323b5e66707e4c7acd8cc45d6213654f
+Subproject commit fdb497b8f81571c2759a377b78053a93d80e8fd2
diff --git a/components/novatel_oem615 b/components/novatel_oem615
index 8d526247..0262b960 160000
--- a/components/novatel_oem615
+++ b/components/novatel_oem615
@@ -1 +1 @@
-Subproject commit 8d526247d049ba1ec45f0eb108daff7f9e8e8003
+Subproject commit 0262b9603fb6d9d22fccc4a51146407f4e8a6ff7
diff --git a/components/sample b/components/sample
index e376c0ea..0f661268 160000
--- a/components/sample
+++ b/components/sample
@@ -1 +1 @@
-Subproject commit e376c0ea1565a8905d736f271f5c593c87c732cd
+Subproject commit 0f6612685d144ae653fc5c81059dba19480d5ef1
diff --git a/components/syn b/components/syn
index dcf625c3..f92129c7 160000
--- a/components/syn
+++ b/components/syn
@@ -1 +1 @@
-Subproject commit dcf625c30879d129aaa25a36789cf676cce59973
+Subproject commit f92129c74b52b52159c9516505f0f90e97086b74