diff --git a/playwright-tests/business-logic/types/IBailoutFlags.ts b/playwright-tests/business-logic/types/IBailoutFlags.ts
index 790d4209..2a5ec3c7 100644
--- a/playwright-tests/business-logic/types/IBailoutFlags.ts
+++ b/playwright-tests/business-logic/types/IBailoutFlags.ts
@@ -1,6 +1,5 @@
 export default interface IBailoutFlags {
     isVehicleSelectBailout: boolean,    
-    isDoNotSeeMyShopBailout: boolean,   
     isTpaNotEnabledBailout: boolean,     
     isRequestCallbackBailout: boolean,  
     isHeavyTruckVehicleBailout: boolean,    
diff --git a/playwright-tests/tests/0011_EssentialDoNotSeeShopBailout.ts b/playwright-tests/tests/0011_EssentialDoNotSeeShopBailout.ts
index 40bdd106..9f9e2f13 100644
--- a/playwright-tests/tests/0011_EssentialDoNotSeeShopBailout.ts
+++ b/playwright-tests/tests/0011_EssentialDoNotSeeShopBailout.ts
@@ -16,7 +16,6 @@ const essentialDoNotSeeShopData: Partial<ITestData> = {
     partQuestions: undefined,
     isSafelite: false,
     bailoutFlags: {
-        isDoNotSeeMyShopBailout: true
     },
     servicePackage: faker.helpers.enumValue(ServicePackage),
     customerDetails: {
diff --git a/playwright-tests/tests/advanced/0026a_NoDeductibleAdasBailout5.ts b/playwright-tests/tests/advanced/0026a_NoDeductibleAdasBailout5.ts
index ebfe3c79..c70be807 100644
--- a/playwright-tests/tests/advanced/0026a_NoDeductibleAdasBailout5.ts
+++ b/playwright-tests/tests/advanced/0026a_NoDeductibleAdasBailout5.ts
@@ -23,7 +23,7 @@ const customerDetails: ICustomerDetails = {
     }
 }
 
-const policyNumber = `~AutomatedScenario0026a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0026a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0026a', customerDetails, policyNumber);
 
 const advancedScenario0026aData: Partial<ITestData> = {
@@ -35,7 +35,6 @@ const advancedScenario0026aData: Partial<ITestData> = {
     isRecalNotification: true,
     endorsements: undefined,
     bailoutFlags: {
-        isDoNotSeeMyShopBailout: true
     },
     vehiclePartQuestions: [
     ],