diff --git a/UAT/ehr/csi-ehr-com-ip-dashboardwidget-dotnet-sev/kustomization.yaml b/UAT/ehr/csi-ehr-com-ip-dashboardwidget-dotnet-sev/kustomization.yaml
index fd63c6e..55d4bcf 100644
--- a/UAT/ehr/csi-ehr-com-ip-dashboardwidget-dotnet-sev/kustomization.yaml
+++ b/UAT/ehr/csi-ehr-com-ip-dashboardwidget-dotnet-sev/kustomization.yaml
@@ -19,24 +19,17 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: .*
+    name: sync-presync
   patch: |-
+    - op: replace
+      path: /metadata/name
+      value: before-csi-ehr-com-ip-dashboardwidget-dotnet-sev
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
         name: CSI_PROJECT_NAME
         value: "csi-ehr-com-ip-dashboardwidget-dotnet-sev"
 
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: sync-presync
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: before-csi-ehr-com-ip-dashboardwidget-dotnet-sev
-
 - target:
     group: batch
     version: v1
@@ -46,6 +39,11 @@ patchesJson6902:
     - op: replace
       path: /metadata/name
       value: after-csi-ehr-com-ip-dashboardwidget-dotnet-sev
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_PROJECT_NAME
+        value: "csi-ehr-com-ip-dashboardwidget-dotnet-sev"
 
 - target:
     group: batch
diff --git a/UAT/ehr/csi-ehr-config-java-sev/kustomization.yaml b/UAT/ehr/csi-ehr-config-java-sev/kustomization.yaml
index 25fb247..a1ad008 100644
--- a/UAT/ehr/csi-ehr-config-java-sev/kustomization.yaml
+++ b/UAT/ehr/csi-ehr-config-java-sev/kustomization.yaml
@@ -6,7 +6,7 @@ resources:
 
 patchesStrategicMerge:
 - hpa.yaml
-#- patch-pod.yaml
+
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-ehr-config-java-sev
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-ehr-config-java-sev
@@ -19,24 +19,17 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: .*
+    name: sync-presync
   patch: |-
+    - op: replace
+      path: /metadata/name
+      value: before-ehr-config-java  
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
         name: CSI_PROJECT_NAME
         value: "csi-ehr-config-java-sev"
 
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: sync-presync
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: before-ehr-config-java  
-
 - target:
     group: batch
     version: v1
@@ -46,6 +39,11 @@ patchesJson6902:
     - op: replace
       path: /metadata/name
       value: after-ehr-config-java  
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_PROJECT_NAME
+        value: "csi-ehr-config-java-sev"
       
 - target:
     group: batch
diff --git a/UAT/empi/csi-empi-patient-registration-srv/kustomization.yaml b/UAT/empi/csi-empi-patient-registration-srv/kustomization.yaml
index e8cf624..6a2c709 100644
--- a/UAT/empi/csi-empi-patient-registration-srv/kustomization.yaml
+++ b/UAT/empi/csi-empi-patient-registration-srv/kustomization.yaml
@@ -8,7 +8,6 @@ replicas:
  - name: csi-net-empiwrit
    count: 1
 
-
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-empi-patient-registration-srv
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-empi-patient-registration-srv
@@ -16,8 +15,6 @@ images:
 
 namespace: csi-uat
 
-namePrefix: old-
-
 patchesJson6902:
 - target:
     group: apps