diff --git a/Makefile b/Makefile
index 2eb5fdc4..0852ced2 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ fsw:
 	./scripts/docker_build_fsw.sh
 
 gsw:
-	./scripts/create_cosmos_gem.sh
+	./cfg/build/gsw_build.sh
 
 launch:
 	./scripts/docker_launch.sh
diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
index 1216ec61..031c7214 100644
--- a/cfg/nos3-mission.xml
+++ b/cfg/nos3-mission.xml
@@ -1,5 +1,6 @@
 <nos3-mission-cfg>
     <start-time>814048200.0</start-time>
+    <gsw>cosmos</gsw>
     <number-spacecraft>1</number-spacecraft>
     <sc-1-cfg>sc-full-config.xml</sc-1-cfg>
     <!--
diff --git a/components/generic_eps b/components/generic_eps
index 6eccddc3..9c5c174b 160000
--- a/components/generic_eps
+++ b/components/generic_eps
@@ -1 +1 @@
-Subproject commit 6eccddc35d57368d9ada312158457be7ccd94b00
+Subproject commit 9c5c174b42d35582408f19c266c97854cc7a16e1
diff --git a/gsw/cosmos b/gsw/cosmos
index 14a27fd4..49009d7b 160000
--- a/gsw/cosmos
+++ b/gsw/cosmos
@@ -1 +1 @@
-Subproject commit 14a27fd4951afc42c152cfa7760b056f9252d0f9
+Subproject commit 49009d7befd9ec1d57661a3bbe80e7246ed05170
diff --git a/scripts/configure.py b/scripts/configure.py
index cd791aed..efd0c737 100755
--- a/scripts/configure.py
+++ b/scripts/configure.py
@@ -1,10 +1,11 @@
 #
 # Convenience script for NOS3 development
-# Configures NOS3 flight software (FSW) based on mission XML files
+# Configures NOS3 based on mission and spacecraft XML files
 #   Script assumes run from top level directory of NOS3 repo
 #
 
 import datetime
+import os
 import xml.etree.ElementTree as ET
 
 # Parse mission configuration
@@ -15,6 +16,26 @@
 mission_start_time_utc = datetime.datetime(2000, 1, 1, 12, 0) + datetime.timedelta(seconds=float(mission_start_time))
 print('  start-time-utc:', mission_start_time_utc)
 
+# GSW
+gsw_str = 'gsw'
+gsw_cfg = mission_root.find(gsw_str).text
+print(' ', gsw_str, ':', gsw_cfg)
+gsw_identified = 0
+if (gsw_cfg == 'openc3'):
+    # Copy openc3 scripts into ./cfg/build
+    gsw_identified = 1
+    os.system('cp ./scripts/gsw_openc3_build.sh ./cfg/build/gsw_build.sh')
+    os.system('cp ./scripts/gsw_openc3_launch.sh ./cfg/build/gsw_launch.sh')
+if (gsw_cfg == 'cosmos'):
+    # Copy cosmos scripts into ./cfg/build
+    gsw_identified = 1
+    os.system('cp ./scripts/gsw_cosmos_build.sh ./cfg/build/gsw_build.sh')
+    os.system('cp ./scripts/gsw_cosmos_launch.sh ./cfg/build/gsw_launch.sh')
+if (gsw_identified == 0):
+    print('Invalid GSW in configuration file!')
+    print('Exiting due to error...')
+
+# Read number of spacecraft
 mission_number_spacecraft = mission_root.find('number-spacecraft').text
 print('  number-spacecraft:', mission_number_spacecraft)
 num_sc = int(mission_number_spacecraft)
diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh
index 4539a4e7..c17d983b 100755
--- a/scripts/docker_launch.sh
+++ b/scripts/docker_launch.sh
@@ -41,7 +41,6 @@ mkdir /tmp/uplink 2> /dev/null
 cp $BASE_DIR/fsw/build/exe/cpu1/cf/cfe_es_startup.scr /tmp/uplink/tmp0.so 2> /dev/null
 cp $BASE_DIR/fsw/build/exe/cpu1/cf/sample.so /tmp/uplink/tmp1.so 2> /dev/null
 
-
 echo "Create ground networks..."
 $DNETWORK create \
     --driver=bridge \
@@ -50,6 +49,9 @@ $DNETWORK create \
     nos3_core
 echo ""
 
+#echo "Launch GSW..."
+$BASE_DIR/cfg/build/gsw_launch.sh
+echo ""
 
 echo "Create NOS interfaces..."
 export GND_CFG_FILE="-f nos3-simulator.xml"
@@ -57,11 +59,9 @@ gnome-terminal --tab --title="NOS Terminal"      -- $DFLAGS -v $SIM_DIR:$SIM_DIR
 gnome-terminal --tab --title="NOS UDP Terminal"  -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_udp_terminal"    --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal
 echo ""
 
-
 # Note only currently working with a single spacecraft
 export SATNUM=1
 
-
 #
 # Spacecraft Loop
 #
@@ -81,7 +81,7 @@ do
     echo ""
 
     echo $SC_NUM " - Connect COSMOS to spacecraft network..."
-    $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos 2> /dev/null
+    $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos
     echo ""
 
     echo $SC_NUM " - 42..."
@@ -131,7 +131,6 @@ do
     echo ""
 done
 
-
 echo "NOS Time Driver..."
 sleep 8
 gnome-terminal --tab --title="NOS Time Driver"   -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time
@@ -145,13 +144,4 @@ do
 done
 echo ""
 
-
-echo "COSMOS Ground Station..."
-pidof firefox > /dev/null
-if [ $? -eq 1 ]
-then
-    firefox localhost:2900 &
-fi
-echo ""
-
 echo "Docker launch script completed!"
diff --git a/scripts/docker_stop.sh b/scripts/docker_stop.sh
index 5c63486f..d8dea64b 100755
--- a/scripts/docker_stop.sh
+++ b/scripts/docker_stop.sh
@@ -18,6 +18,7 @@ rm -rf $BASE_DIR/fsw/build/exe/cpu1/scratch/*
 cd $SCRIPT_DIR; $DFLAG compose down > /dev/null 2>&1
 $DCALL ps --filter=name="sc_*" -aq | xargs $DCALL stop > /dev/null 2>&1 &
 $DCALL ps --filter=name="nos_*" -aq | xargs $DCALL stop > /dev/null 2>&1 &
+$DCALL ps --filter ancestor="ballaerospace/cosmos:4.5.0" -aq | xargs $DCALL stop > /dev/null 2>&1 &
 
 # Intentionally wait to complete
 wait 
diff --git a/scripts/gsw.sh b/scripts/gsw.sh
deleted file mode 100755
index 2646dbdb..00000000
--- a/scripts/gsw.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash -i
-#
-# Convenience script for NOS3 development
-#
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-source $SCRIPT_DIR/env.sh
-
-# Debugging
-#echo "Script directory = " $SCRIPT_DIR
-#echo "Base directory   = " $BASE_DIR
-#exit
-
-#echo "Make /tmp folders..."
-#mkdir /tmp/data 2> /dev/null
-#mkdir /tmp/data/hk 2> /dev/null
-#mkdir /tmp/uplink 2> /dev/null
-
-echo "COSMOS Ground Station..."
-#cd $BASE_DIR/gsw/cosmos
-#export MISSION_NAME=$(echo "NOS3")
-#export PROCESSOR_ENDIANNESS=$(echo "LITTLE_ENDIAN")
-#ruby Launcher -c nos3_launcher.txt --system nos3_system.txt &
-firefox localhost:2900 &
diff --git a/scripts/gsw_cosmos_build.sh b/scripts/gsw_cosmos_build.sh
new file mode 100644
index 00000000..53085664
--- /dev/null
+++ b/scripts/gsw_cosmos_build.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -i
+#
+# Convenience script for NOS3 development
+#
+
+CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts
+source $SCRIPT_DIR/env.sh
+
+# Debugging
+#echo "Script directory = " $SCRIPT_DIR
+#echo "Base directory   = " $BASE_DIR
+#exit
+
+#echo "Make /tmp folders..."
+#mkdir /tmp/data 2> /dev/null
+#mkdir /tmp/data/hk 2> /dev/null
+#mkdir /tmp/uplink 2> /dev/null
+
+echo "COSMOS build..."
diff --git a/scripts/gsw_cosmos_launch.sh b/scripts/gsw_cosmos_launch.sh
new file mode 100644
index 00000000..6aac07df
--- /dev/null
+++ b/scripts/gsw_cosmos_launch.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -i
+#
+# Convenience script for NOS3 development
+#
+
+CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts
+source $SCRIPT_DIR/env.sh
+
+# Debugging
+#echo "Script directory = " $SCRIPT_DIR
+#echo "Base directory   = " $BASE_DIR
+#exit
+
+#echo "Make /tmp folders..."
+#mkdir /tmp/data 2> /dev/null
+#mkdir /tmp/data/hk 2> /dev/null
+#mkdir /tmp/uplink 2> /dev/null
+
+echo "COSMOS launch..."
+gnome-terminal --tab --title="Cosmos" -- $DFLAGS -v $BASE_DIR:$BASE_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3_core ballaerospace/cosmos:4.5.0
diff --git a/scripts/create_cosmos_gem.sh b/scripts/gsw_openc3_build.sh
old mode 100755
new mode 100644
similarity index 86%
rename from scripts/create_cosmos_gem.sh
rename to scripts/gsw_openc3_build.sh
index 39aa648e..a4e8d19b
--- a/scripts/create_cosmos_gem.sh
+++ b/scripts/gsw_openc3_build.sh
@@ -3,7 +3,8 @@
 # Convenience script for NOS3 development
 #
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts
 source $SCRIPT_DIR/env.sh
 
 # Check that local NOS3 directory exists
@@ -14,6 +15,17 @@ if [ ! -d $USER_NOS3_DIR ]; then
     exit 1
 fi
 
+echo "Prepare openc3-cosmos containers..."
+cd $OPENC3_DIR
+$OPENC3_PATH run
+echo ""
+
+#echo "Set a password in openc3-cosmos via firefox..."
+#echo "  Refresh webpage if error page shown."
+#echo ""
+#sleep 5
+#firefox localhost:2900 &
+
 # Start by changing to a known location
 cd $OPENC3_DIR
 
@@ -146,6 +158,8 @@ echo ""
 ## Set permissions on build files
 #chmod -R 777 $BASE_DIR/gsw/cosmos/build
 
-echo "Create COSMOS gem script complete."
-echo "Note that while this script is complete, COSMOS is likely still be processing behind the scenes!"
+echo "OpenC3 build script complete."
+echo "Note that while this script is complete, OpenC3 is likely still be processing behind the scenes!"
+sleep 15
+echo "Done sleeping, but check cpu use prior to proceeding!"
 echo ""
diff --git a/scripts/gsw_openc3_launch.sh b/scripts/gsw_openc3_launch.sh
new file mode 100644
index 00000000..6cd6fcf2
--- /dev/null
+++ b/scripts/gsw_openc3_launch.sh
@@ -0,0 +1,25 @@
+#!/bin/bash -i
+#
+# Convenience script for NOS3 development
+#
+
+CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts
+source $SCRIPT_DIR/env.sh
+
+# Debugging
+#echo "Script directory = " $SCRIPT_DIR
+#echo "Base directory   = " $BASE_DIR
+#exit
+
+#echo "Make /tmp folders..."
+#mkdir /tmp/data 2> /dev/null
+#mkdir /tmp/data/hk 2> /dev/null
+#mkdir /tmp/uplink 2> /dev/null
+
+echo "OpenC3 launch..."
+pidof firefox > /dev/null
+if [ $? -eq 1 ]
+then
+    firefox localhost:2900 &
+fi
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index f598887a..f44373af 100755
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -5,6 +5,8 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
+echo ""
+echo ""
 
 echo "Create local user directory..."
 mkdir $USER_NOS3_DIR 2> /dev/null
@@ -20,9 +22,8 @@ git reset --hard
 echo ""
 echo ""
 
-echo "Prepare openc3-cosmos containers..."
-cd $OPENC3_DIR
-$OPENC3_PATH run
+echo "Prepare cosmos docker container..."
+$DCALL image pull ballaerospace/cosmos:4.5.0
 echo ""
 echo ""
 
@@ -38,9 +39,3 @@ cd $USER_NOS3_DIR/42
 $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NOS3_DIR/42 --name "nos3_42_build" $DBOX make
 echo ""
 echo ""
-
-echo "Set a password in openc3-cosmos via firefox..."
-echo "  Refresh webpage if error page shown."
-echo ""
-sleep 5
-firefox localhost:2900 &
diff --git a/scripts/real_clean.sh b/scripts/real_clean.sh
index cecae881..0ca0ba06 100755
--- a/scripts/real_clean.sh
+++ b/scripts/real_clean.sh
@@ -20,4 +20,7 @@ yes | rm $BASE_DIR/minicom.cap 2> /dev/null
 
 $DCALL system prune -f
 
+echo "Cleaning up local user directory..."
+yes | rm -r $USER_NOS3_DIR 2> /dev/null
+
 exit 0
diff --git a/scripts/stop_gsw.sh b/scripts/stop_gsw.sh
index 64767e8e..d42f532e 100755
--- a/scripts/stop_gsw.sh
+++ b/scripts/stop_gsw.sh
@@ -6,6 +6,11 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
 
-echo "Stop openc3-cosmos..."
+echo "Stop gsw..."
+
+# OpenC3
 cd $OPENC3_DIR
 $OPENC3_PATH stop
+
+# COSMOS
+$DCALL ps --filter ancestor="ballaerospace/cosmos:4.5.0" -aq | xargs $DCALL stop > /dev/null 2>&1 &