diff --git a/.ci/setup/container/tpm2_common.sh b/.ci/setup/container/tpm2_common.sh
index 11523b07..517ee260 100755
--- a/.ci/setup/container/tpm2_common.sh
+++ b/.ci/setup/container/tpm2_common.sh
@@ -271,7 +271,6 @@ function startFreshTpmServer {
   while [[ $# -gt 0 ]]; do
     case $1 in
       -f|--force|--restart)
-	echo "Forcing a restart of the TPM server."
 	stopTpmServer
 	sleep 5
 	shift # past argument
diff --git a/.ci/system-tests/setup_system_tests.sh b/.ci/system-tests/setup_system_tests.sh
index bb6d1d14..f8398e28 100755
--- a/.ci/system-tests/setup_system_tests.sh
+++ b/.ci/system-tests/setup_system_tests.sh
@@ -27,7 +27,7 @@ docker exec $tpm2_container sh -c "/tmp/auto_clone_branch $1 > /dev/null 2>&1 \
 # Install HIRS Provisioner.Net and setup tpm2 simulator.
 # In doing so, tests a single provision between Provisioner.Net and ACA.
 echo "Launching provisioner setup"
-docker exec $tpm2_container sh /hirs/.ci/setup/container/setup_tpm2provisioner_dotnet.sh
+docker exec -i $tpm2_container /bin/bash -c "/hirs/.ci/setup/container/setup_tpm2provisioner_dotnet.sh"
 
 # Initiating System Tests
 echo "******** Setup Complete. Beginning HIRS System Tests. ******** "
diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh
index 1814d3e0..58b8b39c 100644
--- a/.ci/system-tests/sys_test_common.sh
+++ b/.ci/system-tests/sys_test_common.sh
@@ -107,7 +107,7 @@ provisionTpm2() {
 }
 
 resetTpmForNewTest() {
-  docker exec $tpm2_container -it bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; startFreshTpmServer -f; startupTpm; installEkCert"
+  docker exec -i $tpm2_container /bin/bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; startFreshTpmServer -f; startupTpm; installEkCert"
 }
 
 # Places platform cert(s) held in the test folder(s) in the provisioners tcg folder
@@ -126,7 +126,7 @@ docker exec $tpm2_container sh /hirs/.ci/system-tests/container/rim_setup.sh $1
 
 setAppsettings() {
   OPTIONS=$@
-  docker exec $tpm2_container -it bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; setCiHirsAppsettingsFile $OPTIONS"
+  docker exec -i $tpm2_container /bin/bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; setCiHirsAppsettingsFile $OPTIONS"
 }
 
 # Writes to the Action ouput, ACA log, and Provisioner Log