diff --git a/UAT/bloodbank/bb-donation_srv/kustomization.yaml b/UAT/bloodbank/bb-donation_srv/kustomization.yaml
index 03accb0..08a9db6 100644
--- a/UAT/bloodbank/bb-donation_srv/kustomization.yaml
+++ b/UAT/bloodbank/bb-donation_srv/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
 patchesStrategicMerge:
 - hpa.yaml
 
-
 images:
 - name: harbor.moh.gov.sa/vidamoh/bb-donation-srv
   newName: registry.cloudsolutions.com.sa/vida-qa/bb-donation_srv
@@ -20,20 +19,13 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: .*
-  patch: |
+    name: sync-presync
+  patch: |-
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
         name: CSI_PROJECT_NAME
         value: "bb-donation_srv"
-
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: sync-presync
-  patch: |-
     - op: replace
       path: /metadata/name
       value: before-bb-donation-srv
@@ -44,6 +36,11 @@ patchesJson6902:
     kind: Job
     name: sync-postsync
   patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_PROJECT_NAME
+        value: "bb-donation_srv"
     - op: replace
       path: /metadata/name
       value: after-bb-donation-srv
diff --git a/UAT/lab/lab-labmgt-srv/kustomization.yaml b/UAT/lab/lab-labmgt-srv/kustomization.yaml
index 14453e2..4aeead2 100644
--- a/UAT/lab/lab-labmgt-srv/kustomization.yaml
+++ b/UAT/lab/lab-labmgt-srv/kustomization.yaml
@@ -6,46 +6,40 @@ resources:
 patchesStrategicMerge:
 - hpa.yaml
 
-
 images:
 - name: harbor.moh.gov.sa/vidamoh/lab-labmgt-srv
   newName: registry.cloudsolutions.com.sa/vida-qa/lab-labmgt_srv
   newTag: V4.0.0425_W4-3_qa
 
 namespace: csi-uat
+
 patchesJson6902:
 - target:
-      group: batch
-      version: v1
-      kind: Job
-      name: before
+    group: batch
+    version: v1
+    kind: Job
+    name: sync-presync
   patch: |-
-    - op: replace
-      path: /metadata/name
-      value: before-labmgmtdotnet
-      namespace: moh-uat
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
-        name: CSI_MODULENAME
+        name: CSI_PROJECT_NAME
         value: "lab-labmgt_srv"
-    - op: add
-      path: /spec/template/spec/containers/0/env/-
-      value:
-        name: CSI_DATA_VERSION
-        value: ""
+    - op: replace
+      path: /metadata/name
+      value: lab-labmgt_srv
+
+- target:
+    group: batch
+    version: v1
+    kind: Job
+    name: sync-postsync
+  patch: |-
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
         name: CSI_PROJECT_NAME
         value: "lab-labmgt_srv"
-    - op: add
-      path: /spec/template/spec/containers/0/env/-
-      value:
-        name: CSI_MODULE_NAME
-        value: "labmgmtdotnet"
-    - op: add
-      path: /spec/template/spec/containers/0/env/-
-      value:
-        name: CSI_PARENT_MODULE_NAME
-        value: "lab"      
+    - op: replace
+      path: /metadata/name
+      value: lab-labmgt_srv