diff --git a/Makefile b/Makefile
index f6b8ec8ce..e6786f41f 100755
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ all: ## Build everything: config, fsw, sim, gsw
 
 build-cryptolib: ## Build CryptoLib Component, ## -DSTANDALONE_TCP=0 if using udp for cryptolib in the loop
 	mkdir -p $(GSWBUILDDIR)
-	cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DSA_FILE=OFF -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib
+	cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib
 	$(MAKE) --no-print-directory -C $(GSWBUILDDIR)
 
 build-fsw: ## Build the flight software (cFS or F')
diff --git a/cfg/nos3_defs/cpu1_cfe_es_startup.scr b/cfg/nos3_defs/cpu1_cfe_es_startup.scr
index c320c33db..b9dc2343d 100644
--- a/cfg/nos3_defs/cpu1_cfe_es_startup.scr
+++ b/cfg/nos3_defs/cpu1_cfe_es_startup.scr
@@ -3,7 +3,7 @@ CFE_LIB, hwlib,                     hwlib_Init,               HW_LIB,
 CFE_LIB, io_lib,                    IO_LibInit,               IO_LIB,           0,  0,     0x0, 0;
 
 CFE_APP, sch,                       SCH_AppMain,              SCH,              40, 16384, 0x0, 0;
-CFE_APP, ci,                        CI_AppMain,               CI,               41, 16384, 0x0, 0;
+CFE_APP, ci,                        CI_AppMain,               CI,               41, 32768, 0x0, 0;
 CFE_APP, to,                        TO_AppMain,               TO,               42, 32768, 0x0, 0;
 
 CFE_APP, ci_lab,                    CI_Lab_AppMain,           CI_LAB_APP,       80, 16384, 0x0, 0;
diff --git a/cfg/nos3_defs/global_build_options.cmake b/cfg/nos3_defs/global_build_options.cmake
index 3a02fd313..d47b77e1a 100644
--- a/cfg/nos3_defs/global_build_options.cmake
+++ b/cfg/nos3_defs/global_build_options.cmake
@@ -33,5 +33,6 @@ set(CRYPTO_LIBGCRYPT ON CACHE BOOL "Cryptography Module - Libgcrypt" FORCE)
 #set(DEBUG ON CACHE BOOL "CryptoLib Debug" FORCE)
 set(KEY_INTERNAL ON CACHE BOOL "Key Module - Internal" FORCE)
 set(MC_INTERNAL ON CACHE BOOL "Monitoring and Control - Internal" FORCE)
-set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE)
+#set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE)
 set(SA_INTERNAL ON CACHE BOOL "Security Association - Internal" FORCE)
+set(CRYPTO_EPROC ON CACHE BOOL "Extended Procedures" FORCE)
diff --git a/cfg/nos3_defs/tables/to_config.c b/cfg/nos3_defs/tables/to_config.c
index b366811be..126c3e11b 100644
--- a/cfg/nos3_defs/tables/to_config.c
+++ b/cfg/nos3_defs/tables/to_config.c
@@ -82,6 +82,16 @@ extern "C" {
 */
 #define CF_CONFIG_TLM_MID 0x08B2
 #define CF_PDU_TLM_MID    0x0FFD
+#define CRYPTO_EP_TLM_MID 0x0980
+#define CRYPTO_KEY_INV_TLM_MID 0x0981
+#define CRYPTO_KEY_VRFY_TLM_MID 0x0982
+#define CRYPTO_MC_PING_TLM_MID 0x0983
+#define CRYPTO_MC_STATUS_TLM_MID 0x0984
+#define CRYPTO_MC_DUMP_TLM_MID 0x0985
+#define CRYPTO_MC_ERASE_TLM_MID 0x0986
+#define CRYPTO_MC_SELFTEST_TLM_MID 0x0987
+#define CRYPTO_SA_READARSN_TLM_MID 0x0988
+#define CRYPTO_SA_STATUS_TLM_MID 0x0989
 
 static CFE_TBL_FileDef_t CFE_TBL_FileDef =
 {
@@ -163,16 +173,16 @@ TO_ConfigTable_t to_ConfigTable =
        //{CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_DO_MID),          {0,0},  32,  0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
        
        /* 50 - 59 */
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
-       {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_EP_TLM_MID),           {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_KEY_INV_TLM_MID),      {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_KEY_VRFY_TLM_MID),     {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_PING_TLM_MID),      {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_STATUS_TLM_MID),    {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_DUMP_TLM_MID),      {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_ERASE_TLM_MID),     {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_SELFTEST_TLM_MID),  {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_SA_READARSN_TLM_MID),  {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
+       {CFE_SB_MSGID_WRAP_VALUE(CRYPTO_SA_STATUS_TLM_MID),    {0,0},  32,   0xffff,     TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
        
        /* 60 - 69 */
        {CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY),              {0,0},  0,   0x0000,     TO_GROUP_NONE,            0,0},
diff --git a/components/cryptolib b/components/cryptolib
index 5029af5ab..e02eab3ad 160000
--- a/components/cryptolib
+++ b/components/cryptolib
@@ -1 +1 @@
-Subproject commit 5029af5abc84a3280365d5581ba8b25e07c7567d
+Subproject commit e02eab3adae32b9634d9229fb02ff857112022df
diff --git a/fsw/apps/ci b/fsw/apps/ci
index 01a9e5147..388a1d733 160000
--- a/fsw/apps/ci
+++ b/fsw/apps/ci
@@ -1 +1 @@
-Subproject commit 01a9e51472454fd3f2262bf97ad5b3be861f0d22
+Subproject commit 388a1d7338f9d233d50c7affae54c3cce687ea05
diff --git a/fsw/apps/to b/fsw/apps/to
index 3f5225f1f..e52769ece 160000
--- a/fsw/apps/to
+++ b/fsw/apps/to
@@ -1 +1 @@
-Subproject commit 3f5225f1f38d0a595cdcdcb25031a7939d3f0527
+Subproject commit e52769ece8dc08e50646ce7b662f11bef0cca1f0
diff --git a/gsw/cosmos b/gsw/cosmos
index 8cff4dbe9..f7dcfcef1 160000
--- a/gsw/cosmos
+++ b/gsw/cosmos
@@ -1 +1 @@
-Subproject commit 8cff4dbe94c2009442bf362ff93c2740d1dc09f5
+Subproject commit f7dcfcef11e5bdd40ac996046fa86e09c5c7c85a
diff --git a/gsw/yamcs b/gsw/yamcs
index 428879a13..d080d1b72 160000
--- a/gsw/yamcs
+++ b/gsw/yamcs
@@ -1 +1 @@
-Subproject commit 428879a132609998218759139eedbb2a23d42bf4
+Subproject commit d080d1b7225af9ee0d6d3b1a160b85ee20cee7b3
diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh
index de95634ad..caf958a40 100755
--- a/scripts/ci_launch.sh
+++ b/scripts/ci_launch.sh
@@ -161,18 +161,12 @@ for (( i=1; i<=$SATNUM; i++ )); do
         -v /tmp/.X11-unix:/tmp/.X11-unix:ro -w "$USER_NOS3_DIR/42" $DBOX $USER_NOS3_DIR/42/42 NOS3InOut
 
     echo "$SC_NUM - Flight Software..."
-    $DCALL run -dit --name ${SC_NUM}_nos_fsw -h nos-fsw --network=$SC_NET \
+    $DCALL run -dit --name ${SC_NUM}-nos-fsw -h nos-fsw --network=$SC_NET \
         -v "$BASE_DIR:$BASE_DIR" -v "$FSW_DIR:$FSW_DIR" -v "$SCRIPT_DIR:$SCRIPT_DIR" \
         -e USER=$(whoami) -e LD_LIBRARY_PATH=$FSW_DIR:/usr/lib:/usr/local/lib \
         -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice \
         $DBOX bash -c "exec ./core-cpu1 -R PO"
 
-    echo "$SC_NUM - CryptoLib..."
-    $DCALL run -d --name ${SC_NUM}-cryptolib --network=$SC_NET \
-        --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \
-        --network-alias=cryptolib \
-        -v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone
-
     echo "$SC_NUM - Simulators..."
     echo "$SC_NUM - NOS Engine Server..."
     $DCALL run -dit --name ${SC_NUM}-nos-engine-server -h nos-engine-server --network=$SC_NET \
@@ -185,6 +179,12 @@ for (( i=1; i<=$SATNUM; i++ )); do
         -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \
         ./nos3-single-simulator $CFG_FILE truth42sim
 
+    echo "$SC_NUM - CryptoLib..."
+    $DCALL run -d --name ${SC_NUM}-cryptolib-gsw  -h cryptolib --network=$SC_NET \
+        --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \
+        --network-alias=cryptolib \
+        -v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone
+    
     for sim in \
         camsim generic-css-sim generic-eps-sim generic-fss-sim \
         gps generic-imu-sim generic-mag-sim \
@@ -192,13 +192,13 @@ for (( i=1; i<=$SATNUM; i++ )); do
         generic-reactionwheel-sim2 generic-radio-sim sample-sim \
         generic-star-tracker-sim generic-thruster-sim generic-torquer-sim; do
 
-        if [[ "$sim" == "generic_radio_sim" ]]; then
+        if [[ "$sim" == "generic-radio-sim" ]]; then
             $DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \
                 -h radio-sim --network-alias=radio-sim \
                 -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \
                 ./nos3-single-simulator $CFG_FILE $sim
         else
-            $DCALL run -d --name ${SC_NUM}_${sim} --network=$SC_NET \
+            $DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \
                 -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \
                 ./nos3-single-simulator $CFG_FILE $sim
         fi
diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh
index 81e2ebf2c..f8cee48be 100755
--- a/scripts/fsw/fsw_cfs_launch.sh
+++ b/scripts/fsw/fsw_cfs_launch.sh
@@ -138,7 +138,7 @@ do
     echo ""
 
     echo $SC_NUM " - CryptoLib..."
-    gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw"  --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone
+    gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-cryptolib-gsw"  --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone
     echo ""
 done