diff --git a/.ci/setup/setup_tpm2provisioner.sh b/.ci/setup/setup_tpm2provisioner.sh
index 433354a4..1526251f 100755
--- a/.ci/setup/setup_tpm2provisioner.sh
+++ b/.ci/setup/setup_tpm2provisioner.sh
@@ -72,7 +72,7 @@ function initTpm2Emulator {
    # Give tpm_server time to start and register on the DBus
    sleep 1
 
-   tpm2-abrmd -t socket &
+   tpm2-abrmd -t  &
    echo "TPM2-Abrmd started"
 
    # Give ABRMD time to start and register on the DBus
diff --git a/.ci/system-tests/container/rim_setup.sh b/.ci/system-tests/container/rim_setup.sh
index 64881abc..55008d50 100644
--- a/.ci/system-tests/container/rim_setup.sh
+++ b/.ci/system-tests/container/rim_setup.sh
@@ -67,11 +67,12 @@ popd > /dev/null
 #     a: Clear the TPM PCR registers vi a call to the tss clear 
 #     b: Check if a test specific setpcr.sh file exists. If not use the profiles default script
 pushd /ibmtss/utils/
-echo "restarting the TPM simulator to reset the PCR values"
-# ./pcrreset -ha 16
-./shutdown
-./powerup
-echo "TPM simulator restarted"
+echo "clearing the PCR values"
+pkill -f "tpm2-abrmd"
+./pcrreset -ha 1 0
+/ibmtpm/src/./tpm_server &
+tpm2-abrmd -t socket &
+echo "TPM simulator cleared"
 popd
 
 if [[ ! -f $pcrScript ]]; then