diff --git a/src/components/workflow/CreateRequest/ApprovalWorkflowStep.tsx b/src/components/workflow/CreateRequest/ApprovalWorkflowStep.tsx
index 1b6c4c8..def854a 100644
--- a/src/components/workflow/CreateRequest/ApprovalWorkflowStep.tsx
+++ b/src/components/workflow/CreateRequest/ApprovalWorkflowStep.tsx
@@ -334,7 +334,7 @@ export function ApprovalWorkflowStep({
                               <Input
                                 id={`approver-${level}`}
                                 type="email"
-                                placeholder={`approver@${process.env.VITE_APP_DOMAIN}`}
+                                placeholder={`approver@${import.meta.env.VITE_APP_DOMAIN}`}
                                 value={approver.email || ''}
                                 onChange={(e) => handleApproverEmailChange(index, e.target.value)}
                                 className="h-10 border-2 border-gray-300 focus:border-blue-500 mt-1 w-full"
diff --git a/src/dealer-claim/components/request-creation/ClaimApproverSelectionStep.tsx b/src/dealer-claim/components/request-creation/ClaimApproverSelectionStep.tsx
index 945498f..b968c0d 100644
--- a/src/dealer-claim/components/request-creation/ClaimApproverSelectionStep.tsx
+++ b/src/dealer-claim/components/request-creation/ClaimApproverSelectionStep.tsx
@@ -141,7 +141,7 @@ export function ClaimApproverSelectionStep({
           // Create new approver only if it doesn't exist
           if (step.isAuto) {
             // System steps
-            const systemEmail = step.level === 8 ? `finance@${process.env.VITE_APP_DOMAIN}` : `system@${process.env.VITE_APP_DOMAIN}`;
+            const systemEmail = step.level === 8 ? `finance@${import.meta.env.VITE_APP_DOMAIN}` : `system@${import.meta.env.VITE_APP_DOMAIN}`;
             const systemName = step.level === 8 ? 'System/Finance' : 'System';
             newApprovers.push({
               email: systemEmail,
diff --git a/src/dealer-claim/components/request-detail/WorkflowTab.tsx b/src/dealer-claim/components/request-detail/WorkflowTab.tsx
index d1a6aff..ac4fa89 100644
--- a/src/dealer-claim/components/request-detail/WorkflowTab.tsx
+++ b/src/dealer-claim/components/request-detail/WorkflowTab.tsx
@@ -2519,7 +2519,7 @@ export function DealerClaimWorkflowTab({
         stepNumber={selectedStepForEmail?.stepNumber || 4}
         stepName={selectedStepForEmail?.stepName || 'Activity Creation'}
         requestNumber={request?.requestNumber || request?.id || request?.request_number}
-        recipientEmail={`system@${window.location.hostname}`}
+        recipientEmail={`system@${import.meta.env.VITE_EMAIL_DOMAIN}`}
       />
 
       {/* Additional Approver Review Modal */}
diff --git a/src/dealer-claim/components/request-detail/modals/EmailNotificationTemplateModal.tsx b/src/dealer-claim/components/request-detail/modals/EmailNotificationTemplateModal.tsx
index 3a3668f..baafe0f 100644
--- a/src/dealer-claim/components/request-detail/modals/EmailNotificationTemplateModal.tsx
+++ b/src/dealer-claim/components/request-detail/modals/EmailNotificationTemplateModal.tsx
@@ -32,7 +32,7 @@ export function EmailNotificationTemplateModal({
   stepNumber,
   stepName,
   requestNumber = 'RE-REQ-2024-CM-101',
-  recipientEmail = `system@${window.location.hostname}`,
+  recipientEmail = `system@${import.meta.env.VITE_EMAIL_DOMAIN}`,
   subject,
   emailBody,
 }: EmailNotificationTemplateModalProps) {