diff --git a/UAT/billing/csi-bm-approval-java-service/kustomization.yaml b/UAT/billing/csi-bm-approval-java-service/kustomization.yaml
index 75452a0..634e6d0 100644
--- a/UAT/billing/csi-bm-approval-java-service/kustomization.yaml
+++ b/UAT/billing/csi-bm-approval-java-service/kustomization.yaml
@@ -7,54 +7,43 @@ resources:
 
 patchesStrategicMerge:
 - hpa.yaml
-#- patch-pod.yaml
 
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-bm-approval-java-service
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-bm-approval-java-service
-  newTag: 4.3.660.0_qa   #4.2412_1_D9_dev #4.2412_1_D2_dev #4.2411_1_D4-b15_dev #4.2411_1_D4-b11_dev #4.2411_1_D4-b10_dev #4.2411_1_D8-b1 #4.2411_1_D8_dev #4.2411_1_D7_dev
+  newTag: 4.3.660.0_qa   
 
 namespace: csi-uat
 
-# patches:
-# - target:
-#     group: batch
-#     version: v1
-#     kind: Job
-#     name: .*
-#   patch: |-
-#     - op: add
-#       path: /spec/template/spec/containers/0/env/-
-#       value:
-#         name: CSI_PROJECT_NAME
-#         value: "csi-bm-approval-java-service"
+patches:
+- target:
+    group: batch
+    version: v1
+    kind: Job
+    name: .*
+  patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_PROJECT_NAME
+        value: "csi-bm-approval-java-service"
 
-# - target:
-#     group: batch
-#     version: v1
-#     kind: Job
-#     name: sync-presync
-#   patch: |-
-#     - op: replace
-#       path: /metadata/name
-#       value: before-csi-bm-approval-java-service
+- target:
+    group: batch
+    version: v1
+    kind: Job
+    name: sync-presync
+  patch: |-
+    - op: replace
+      path: /metadata/name
+      value: before-csi-bm-approval-java-service
 
-# - target:
-#     group: batch
-#     version: v1
-#     kind: Job
-#     name: sync-postsync
-#   patch: |-
-#     - op: replace
-#       path: /metadata/name
-#       value: after-csi-bm-approval-java-service
-
-# - target:
-#     group: batch
-#     version: v1
-#     kind: Job
-#     name: sync-postsync
-#   patch: |-
-#     - op: replace
-#       path: /metadata/name
-#       value: after-csi-bm-approval-java-service
+- target:
+    group: batch
+    version: v1
+    kind: Job
+    name: sync-postsync
+  patch: |-
+    - op: replace
+      path: /metadata/name
+      value: after-csi-bm-approval-java-service
diff --git a/UAT/billing/csi-bm-approval-ui/kustomization.yaml b/UAT/billing/csi-bm-approval-ui/kustomization.yaml
index 11c15d8..d7a00b6 100644
--- a/UAT/billing/csi-bm-approval-ui/kustomization.yaml
+++ b/UAT/billing/csi-bm-approval-ui/kustomization.yaml
@@ -4,9 +4,6 @@ resources:
 - https://git.cloudsolutions.com.sa/BASE/CENTRAL-BASE-REPO/billing/bmapprovalui
 - ../../../DM-Initiator/
 
-#patches:
-#- patch-pod.yaml
-
 replicas:
 - name: csi-approval-ui
   count: 1
@@ -14,7 +11,7 @@ replicas:
 images:
 - name: harbor.moh.gov.sa/vidamoh/approval-ui
   newName: registry.cloudsolutions.com.sa/vida-qa/approval-ui
-  newTag: 4.4.44.0_qa   #4.3.2.65_qa
+  newTag: 4.4.44.0_qa   
 
 namespace: csi-uat
 patchesJson6902:
@@ -29,6 +26,7 @@ patchesJson6902:
       value:
         name: CSI_PROJECT_NAME
         value: "csi-bm-approval-ui"
+        
 - target:
     group: batch
     version: v1
diff --git a/UAT/billing/csi-bm-promotion-java-service/kustomization.yaml b/UAT/billing/csi-bm-promotion-java-service/kustomization.yaml
index 25baa3e..a75214b 100644
--- a/UAT/billing/csi-bm-promotion-java-service/kustomization.yaml
+++ b/UAT/billing/csi-bm-promotion-java-service/kustomization.yaml
@@ -3,9 +3,6 @@ kind: Kustomization
 resources:
 - https://git.cloudsolutions.com.sa/BASE/CENTRAL-BASE-REPO/billing/csi-bm-promotion-java-service
 - ../../../DM-Initiator/
-#- post-sync.yaml
-
-
 
 replicas:
 - name: csi-bm-promotion-java-service
@@ -14,7 +11,7 @@ replicas:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-bm-promotion-java-service
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-bm-promotion-java-service
-  newTag: 4.3.3.11_dev3_dev #4.6.2.0_prod #4.6.1.0_prod #4.6.0.36 #4.6.0.35 #4.6.0.24 #4.6.0.23 #4.6.0.22 
+  newTag: 4.3.3.11_dev3_dev 
 
 namespace: csi-uat
 
diff --git a/UAT/bloodbank/bb-donation_srv/kustomization.yaml b/UAT/bloodbank/bb-donation_srv/kustomization.yaml
index 3593c54..b2a99bb 100644
--- a/UAT/bloodbank/bb-donation_srv/kustomization.yaml
+++ b/UAT/bloodbank/bb-donation_srv/kustomization.yaml
@@ -20,7 +20,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |
     - op: add
       path: /spec/template/spec/containers/0/env/-
diff --git a/UAT/cssd/csi-cssd-java-sev/kustomization.yaml b/UAT/cssd/csi-cssd-java-sev/kustomization.yaml
index e6ba3e0..cbe4579 100644
--- a/UAT/cssd/csi-cssd-java-sev/kustomization.yaml
+++ b/UAT/cssd/csi-cssd-java-sev/kustomization.yaml
@@ -30,6 +30,7 @@ patchesJson6902:
       value:
         name: CSI_PROJECT_NAME
         value: "csi-cssd-java-sev" 
+        
 - target:
     group: batch
     version: v1
diff --git a/UAT/ehr/csi-ehr-ic-dashboard-java-sev/kustomization.yaml b/UAT/ehr/csi-ehr-ic-dashboard-java-sev/kustomization.yaml
index 456a569..0888249 100644
--- a/UAT/ehr/csi-ehr-ic-dashboard-java-sev/kustomization.yaml
+++ b/UAT/ehr/csi-ehr-ic-dashboard-java-sev/kustomization.yaml
@@ -19,7 +19,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |-
     - op: add
       path: /spec/template/spec/containers/0/env/-
diff --git a/UAT/ehr/csi-ehr-opd-java-sev/kustomization.yaml b/UAT/ehr/csi-ehr-opd-java-sev/kustomization.yaml
index 7653144..4f96ca2 100644
--- a/UAT/ehr/csi-ehr-opd-java-sev/kustomization.yaml
+++ b/UAT/ehr/csi-ehr-opd-java-sev/kustomization.yaml
@@ -19,7 +19,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |
     - op: add
       path: /spec/template/spec/containers/0/env/-
diff --git a/UAT/ehr/csi-ehr-or-anesthesia-java-sev/kustomization.yaml b/UAT/ehr/csi-ehr-or-anesthesia-java-sev/kustomization.yaml
index 6666b5f..b0e7f1e 100644
--- a/UAT/ehr/csi-ehr-or-anesthesia-java-sev/kustomization.yaml
+++ b/UAT/ehr/csi-ehr-or-anesthesia-java-sev/kustomization.yaml
@@ -3,17 +3,14 @@ kind: Kustomization
 resources:
 - https://git.cloudsolutions.com.sa/BASE/CENTRAL-BASE-REPO/ehr/ehroranesthesiajava
 - ../../../DM-Initiator/
-#- post-sync.yaml
 
 patchesStrategicMerge:
 - hpa.yaml
-#- patch-pod.yaml
-
 
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-ehr-or-anesthesia-java-sev
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-ehr-or-anesthesia-java-sev
-  newTag: 4.1.71.18_IR_qa #4.1.71.15_dev #4.1.71.14_dev #4.1.71.13_dev #4.2407_1_dev #4.2.1.1 #4.2.1.0 #4.1.54.0
+  newTag: 4.1.71.18_IR_qa 
 
 namespace: csi-uat
 
@@ -22,7 +19,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |-
     - op: add
       path: /spec/template/spec/containers/0/env/-
@@ -48,15 +45,4 @@ patchesJson6902:
   patch: |-
     - op: replace
       path: /metadata/name
-      value: after-csi-ehr-or-anesthesia-java-sev
-
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: post
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: post-ehroranesthesiajava
-      namespace: moh-uat        
+      value: after-csi-ehr-or-anesthesia-java-sev       
diff --git a/UAT/lab/lab-labmgt-srv/kustomization.yaml b/UAT/lab/lab-labmgt-srv/kustomization.yaml
index 9f8674b..8c84dd2 100644
--- a/UAT/lab/lab-labmgt-srv/kustomization.yaml
+++ b/UAT/lab/lab-labmgt-srv/kustomization.yaml
@@ -19,7 +19,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |
     - op: add
       path: /spec/template/spec/containers/0/env/-
diff --git a/UAT/pharmacy/csi-java-ehr-ip-doctor-prescription/kustomization.yaml b/UAT/pharmacy/csi-java-ehr-ip-doctor-prescription/kustomization.yaml
index 7f84da6..d11a660 100644
--- a/UAT/pharmacy/csi-java-ehr-ip-doctor-prescription/kustomization.yaml
+++ b/UAT/pharmacy/csi-java-ehr-ip-doctor-prescription/kustomization.yaml
@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: harbor.moh.gov.sa/vidamoh/csi-java-ehr-ip-doctor-prescription
   newName: registry.cloudsolutions.com.sa/vida-qa/csi-java-ehr-ip-doctor-prescription
-  newTag: 4.2503_14_IR2_qa #4.2501_16_IR1_qa
+  newTag: 4.2503_14_IR2_qa
 
 namespace: csi-uat
 
@@ -20,7 +20,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |-
     - op: add
       path: /spec/template/spec/containers/0/env/-
@@ -46,15 +46,4 @@ patchesJson6902:
   patch: |-
     - op: replace
       path: /metadata/name
-      value: after-csi-java-ehr-ip-doctor-prescription
-
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: post
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: post-ehripprescriptionjava
-      namespace: moh-uat        
+      value: after-csi-java-ehr-ip-doctor-prescription    
diff --git a/UAT/pharmacy/csi-phr-base/kustomization.yaml b/UAT/pharmacy/csi-phr-base/kustomization.yaml
index 8116e5e..2567759 100644
--- a/UAT/pharmacy/csi-phr-base/kustomization.yaml
+++ b/UAT/pharmacy/csi-phr-base/kustomization.yaml
@@ -20,7 +20,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |
     - op: add
       path: /spec/template/spec/containers/0/env/-
diff --git a/UAT/renal/ren-hemodialysis-srv/kustomization.yaml b/UAT/renal/ren-hemodialysis-srv/kustomization.yaml
index 32054f9..892e26d 100644
--- a/UAT/renal/ren-hemodialysis-srv/kustomization.yaml
+++ b/UAT/renal/ren-hemodialysis-srv/kustomization.yaml
@@ -20,7 +20,7 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: before
+    name: .*
   patch: |
     - op: add
       path: /spec/template/spec/containers/0/env/-