diff --git a/.github/workflows/b2c-build-and-deploy.yaml b/.github/workflows/b2c-build-and-deploy.yaml
index 2c9653e4..91034ffc 100644
--- a/.github/workflows/b2c-build-and-deploy.yaml
+++ b/.github/workflows/b2c-build-and-deploy.yaml
@@ -15,6 +15,10 @@ on:
         required: true
         type: string
         description: "Domain name of the B2C tenant."
+      azureB2CTenantId:
+        required: true
+        type: string
+        description: "Tenant Id for the B2C tenant."
       azureB2CProductUrl:
         required: false
         type: string
@@ -83,14 +87,14 @@ jobs:
           yarn generate
 
       - name: Upload TrustFrameworkBase Policy
-        uses: azure-ad-b2c/deploy-trustframework-policy@v5.3
+        uses: Andrews-McMeel-Universal/deploy-trustframework-policy@v5
         with:
           folder: "./dist/custom-policies"
-          files: "B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_BASE.xml,B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_EXTENSIONS.xml,B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_POLICIES.xml,B2C_1A_${{ inputs.azureB2CProductId }}_IMPERSONATION.xml,B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_IMPERSONATION.xml"
-          tenant: ${{ inputs.azureB2CDomain }}
+          files: "B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_BASE.xml,B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_EXTENSIONS.xml,B2C_1A_${{ inputs.azureB2CProductId }}_SIGNINSIGNOUT_POLICIES.xml,B2C_1A_${{ inputs.azureB2CProductId }}_IMPERSONATION.xml"
+          tenantDomain: ${{ inputs.azureB2CDomain }}
+          tenantId: ${{ inputs.azureB2CTenantId }}
           clientId: ${{ secrets.azureB2CClientId }}
           clientSecret: ${{ secrets.azureB2CClientSecret }}
-          verbose: ${{ secrets.ACTIONS_STEP_DEBUG || vars.ACTIONS_STEP_DEBUG || env.ACTIONS_STEP_DEBUG || 'false' }}
 
       - name: Upload Auth Assets
         uses: azure/powershell@v1