diff --git a/src/services/pwcIntegration.service.ts b/src/services/pwcIntegration.service.ts
index 20d1320..3c22b96 100644
--- a/src/services/pwcIntegration.service.ts
+++ b/src/services/pwcIntegration.service.ts
@@ -114,21 +114,15 @@ export class PWCIntegrationService {
             // Extract State Code from Dealer GSTIN
             let dealerGst = dealer?.gstin;
 
-            // HOTFIX: For PWC QA Environment, use a known valid GSTIN if dealer has the invalid test one
-            // The test GSTIN 29AAACE3882D1ZZ is not registered in PWC QA Master, causing Error 701
-            const isQA = this.apiUrl.includes('qa');
-            const invalidTestGst = '29AAACE3882D1ZZ';
-            const validQaGst = '24AAAPI3182M002'; // Registered in PWC QA
+            const uatGst = '24AAAPI3182M002';
+            const isDevOrUat = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'uat';
 
-            if (isQA && (!dealerGst || dealerGst === invalidTestGst)) {
-                logger.info(`[PWC] Using QA authorized GSTIN replacement: ${validQaGst} (Original: ${dealerGst || 'empty'})`);
-                dealerGst = validQaGst;
+            if (isDevOrUat) {
+                logger.info(`[PWC] Using Dev/UAT authorized GSTIN replacement: ${uatGst} (Original: ${dealerGst || 'empty'})`);
+                dealerGst = uatGst;
             }
 
-            // Final fallback if still empty
-            dealerGst = dealerGst || validQaGst;
-
-            logger.info(`[PWC] Final GSTIN being used for authentication: ${dealerGst}`);
+            logger.info(`[PWC] Final GSTIN being used for authentication and seller: ${dealerGst}`);
 
             let dealerStateCode = "24"; // Default fallback (Gujarat for 24...)
 
@@ -411,7 +405,7 @@ export class PWCIntegrationService {
                     SourceSystem: "RE_WORKFLOW",
                     is_irn: "Y",
                     is_ewb: "N",
-                    email: isQA ? "jayesh.jacob1@pwc.com" : ((request as any).initiator?.email || `system@${appDomain}`),
+                    email: isDevOrUat ? "jayesh.jacob1@pwc.com" : ((request as any).initiator?.email || `system@${appDomain}`),
                     TranDtls: {
                         TaxSch: "GST",
                         OutwardInward: "",
@@ -440,7 +434,7 @@ export class PWCIntegrationService {
                         TrdNm: dealer?.dealerName || 'Dealer',
                         Addr1: dealer?.city || "Address Line 1",
                         Loc: dealer?.city || "Location",
-                        Pin: Number(dealer?.pincode || (dealerGst === validQaGst ? 380001 : 600001)),
+                        Pin: Number(dealer?.pincode || (dealerGst === uatGst ? 380001 : 600001)),
                         Stcd: dealerStateCode,
                         Ph: dealer?.phone || "9998887776",
                         Em: dealer?.email || "Supplier@inv.com"