diff --git a/.ci/docker/.env b/.ci/docker/.env
index e5846636..7bcdbb64 100644
--- a/.ci/docker/.env
+++ b/.ci/docker/.env
@@ -27,6 +27,13 @@ HIRS_CI_EFI_PATH_SWIDTAG=$HIRS_CI_EFI_PATH_TCG/manifest/swidtag
 HIRS_CI_TEST_HW_JSON_FILE=$HIRS_CI_TEST_ROOT/hw.json
 HIRS_CI_TEST_EVENT_LOG_FILE=$HIRS_CI_TEST_ROOT/binary_bios_measurements
 
+HIRS_CI_TEST_DEFAULT_PROFILE_DIR=$HIRS_CI_TEST_ROOT/.ci/system-tests/profiles/laptop
+HIRS_CI_TEST_DEFAULT_TEST_DIR=$HIRS_CI_TEST_DEFAULT_PROFILE_DIR/default
+HIRS_CI_TEST_DEFAULT_DMI_ZIP=$HIRS_CI_TEST_DEFAULT_PROFILE_DIR/laptop_dmi.zip
+HIRS_CI_TEST_DEFAULT_HW_JSON_FILE=$HIRS_CI_TEST_DEFAULT_TEST_DIR/laptop_default_hw.json
+HIRS_CI_TEST_DEFAULT_EVENT_LOG=$HIRS_CI_TEST_DEFAULT_TEST_DIR/laptop_default_binary_bios_measurements
+HIRS_CI_TEST_DEFAULT_SETPCRS_SH=$HIRS_CI_TEST_DEFAULT_TEST_DIR/laptop_default_setpcrs.sh
+
 HIRS_CI_TPM_EK_CERT_FILE=/hirs/.ci/setup/certs/ek_cert.der
 HIRS_CI_TPM_EK_CERT_NV_ATTR="0x2000A"
 HIRS_CI_TPM_EK_CERT_NV_INDEX="0x1c00002"
diff --git a/.ci/system-tests/container/pc_setup.sh b/.ci/system-tests/container/pc_setup.sh
index 3f5a6877..ab4155a7 100755
--- a/.ci/system-tests/container/pc_setup.sh
+++ b/.ci/system-tests/container/pc_setup.sh
@@ -64,12 +64,12 @@ hwJsonFile="$testDir/$hwJsonFileName"
 # Use default settings if profile does not have specific changes
 if [ ! -f "$hwJsonFile" ]; then
     echo "Test is using a profile with no hardware manifest file. Using default."
-    hwJsonFile="$profileDir"/default/laptop_default_hw.json
+    hwJsonFile=$HIRS_CI_TEST_DEFAULT_HW_JSON_FILE
 fi
 
 if [ ! -f "$dmiZip" ]; then
     echo "Test is using a profile with no DMI data. Using default."
-    dmiZip="$profileDir"/default/laptop_dmi.zip
+    dmiZip=$HIRS_CI_TEST_DEFAULT_DMI_ZIP
 fi
 
 # Ensure platform folder under efi is set up and cleared
diff --git a/.ci/system-tests/container/rim_setup.sh b/.ci/system-tests/container/rim_setup.sh
index 8d75951a..26b8fe2b 100644
--- a/.ci/system-tests/container/rim_setup.sh
+++ b/.ci/system-tests/container/rim_setup.sh
@@ -69,7 +69,7 @@ $HIRS_CI_REPO_ROOT/.ci/system-tests/container/efi_setup.sh -r
 
 # Step 1: Copy binary_bios_measurement file
 if [ ! -e "$eventLog" ]; then
-  eventLog="$defaultDir"/laptop_default_binary_bios_measurements
+  eventLog=$HIRS_CI_TEST_DEFAULT_EVENT_LOG
 fi
 echo "eventLog used was  $eventLog"
 cp "$eventLog" "$ciTestEventLog"
@@ -110,7 +110,7 @@ popd > /dev/null
 
 #Step 4, run the setpcr script to make the TPM emulator hold values that correspond the binary_bios_measurement file
 if [[ ! -f $pcrScript ]]; then
-    pcrScript="$profileDir/default/"$profile"_default_setpcrs.sh"
+    pcrScript=$HIRS_CI_TEST_DEFAULT_SETPCRS_SH
 fi
 sh $pcrScript;
 
diff --git a/.ci/system-tests/tests/aca_policy_tests.sh b/.ci/system-tests/tests/aca_policy_tests.sh
index def45ea8..2cff1003 100755
--- a/.ci/system-tests/tests/aca_policy_tests.sh
+++ b/.ci/system-tests/tests/aca_policy_tests.sh
@@ -25,7 +25,7 @@ esac
 if [ "$test" = "1" ] || [ "$test" = "all" ]; then
     writeToLogs "### ACA POLICY TEST 1: Test ACA default policy  ###"
     writeToLogs "Now using default appsettings"
-    setPlatformCerts "laptop" "empty"
+    setPlatformCerts -p "laptop" -t "empty"
     provisionTpm2 "pass"
 fi
 if [ "$test" = "2" ] || [ "$test" = "all" ]; then