diff --git a/scripts/cfs_build_fsw.sh b/scripts/cfs_build_fsw.sh
index 38cf7aa0..b845a734 100755
--- a/scripts/cfs_build_fsw.sh
+++ b/scripts/cfs_build_fsw.sh
@@ -7,7 +7,7 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
-source FLIGHT_SOFTWARE=cfs
+
 
 # Check that local NOS3 directory exists
 if [ ! -d $USER_NOS3_DIR ]; then
@@ -29,4 +29,4 @@ fi
 mkdir -p $BASE_DIR/fsw/build
 
 # Build
-$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_fsw" -w $BASE_DIR $DBOX make -j$NUM_CPUS build-fsw
+$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_fsw" -w $BASE_DIR $DBOX make -j$NUM_CPUS -e FLIGHT_SOFTWARE=cfs build-fsw
diff --git a/scripts/env.sh b/scripts/env.sh
index e1c7a799..5accd87a 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -10,7 +10,6 @@ GSW_BIN=$BASE_DIR/gsw/cosmos/build/openc3-cosmos-nos3
 GSW_DIR=$BASE_DIR/gsw/cosmos
 SIM_DIR=$BASE_DIR/sims/build
 SIM_BIN=$SIM_DIR/bin
-FLIGHT_SOFTWARE=fprime
 
 if [ -d $SIM_DIR/bin ]; then
     SIMS=$(ls $SIM_BIN/nos3*simulator) 
diff --git a/scripts/prep_fprime.sh b/scripts/prep_fprime.sh
index ced07056..855f557d 100755
--- a/scripts/prep_fprime.sh
+++ b/scripts/prep_fprime.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
-cd fsw/fprime/fprime-nos3
-mkdir -p fprime-venv
-python3 -m venv fprime-venv/
-. fprime-venv/bin/activate
-pip install -r fprime/requirements.txt
-fprime-util generate
\ No newline at end of file
+# cd fsw/fprime/fprime-nos3
+# # mkdir -p fprime-venv
+# # python3 -m venv fprime-venv/
+# # . fprime-venv/bin/activate
+# # pip install -r fprime/requirements.txt
+# fprime-util generate
+
+echo "Dockerized fprime util generate"
\ No newline at end of file