diff --git a/UAT/rms/csi-rms-morgue-java-service/db-sync.yaml b/UAT/rms/csi-rms-morgue-java-service/db-sync.yaml
deleted file mode 100644
index 14f465f..0000000
--- a/UAT/rms/csi-rms-morgue-java-service/db-sync.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: before
-  namespace: moh-uat
-  annotations:
-    argocd.argoproj.io/hook: PreSync
-    argocd.argoproj.io/hook-delete-policy: HookSucceeded
-    argocd.argoproj.io/sync-wave: "1"
-    #argocd.argoproj.io/sync-options: Prune=false
-spec:
-  backoffLimit: 3
-  template:
-    spec:
-      containers:
-      - name: presync-pod
-        #image: registry.cloudsolutions.com.sa/vida-qa/csi-automation-initiator-stable:latest      
-        image: registry.cloudsolutions.com.sa/vida-qa/csi-automation-initiator:3.0.0.90 #3.0.0.88 #3.0.0.76.2 #3.0.0.74 #3.0.0.66 #3.0.0.69 #V3.0.0.46
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/sh", "-c"]
-        args: ["mkdir automation && git config --global http.sslVerify false && git clone --depth 1 https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Automation.git /usr/app/automation/ && node index.js"]        
-        #args: ["mkdir kafka && mkdir db-Change && mkdir screenPermissions && mkdir mongoIndex && mkdir featureToggles && mkdir LabelTranslations && mkdir masterData && mkdir BusinessPermissions && mkdir Configurations && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Kafka-topic-automation.git /usr/app/kafka/  && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/DB-Change-automation.git /usr/app/db-Change/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Screen-permissions.git /usr/app/screenPermissions/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/MongoDB-indexes.git /usr/app/mongoIndex/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Feature-Toggles.git /usr/app/featureToggles/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/LabelTranslations.git /usr/app/LabelTranslations/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/masterData.git /usr/app/masterData/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Business-Permissions.git /usr/app/BusinessPermissions/ && git config --global http.sslVerify false && git clone https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Configuration.git /usr/app/Configurations/ && node index.js && sleep 10"]
-        resources:
-          #limits:
-            #cpu: 750m
-            #memory: 3Gi
-          requests:
-            cpu: 128m
-            memory: 128Mi
-        env:
-        - name: owner
-          value: "CSI_DEV"
-        - name: repo
-          value: "CSI_DEV"
-        - name: filePath
-          value: "kustomization.yaml"
-        - name: active_profile
-          valueFrom:
-            configMapKeyRef:
-              key: activeProfile
-              name: service-configs
-        - name: SPRING_JPA_HIBERNATE_DIALECT
-          valueFrom:
-            configMapKeyRef:
-              key: db-dialect
-              name: service-configs
-        - name: SPRING_JPA_DATABASE-PLATFORM
-          valueFrom:
-            configMapKeyRef:
-              key: db-dialect
-              name: service-configs
-        - name: configserver
-          valueFrom:
-            configMapKeyRef:
-              key: config_server
-              name: service-configs
-        - name: hostname
-          value: csi-java-ehr-config
-        envFrom:
-        - configMapRef:
-            name: service-configs
-        - secretRef:
-            name: service-configs-secret
-        - configMapRef:
-            name: init-database-configs
-        - secretRef:
-            name: init-database-secrets
-      
-      - name: data-migration-pod     
-        image: registry.cloudsolutions.com.sa/vida-qa/csi-data-migration-initiator:4.0.27.13 #3.0.0.88 #3.0.0.76.2 #3.0.0.74 #3.0.0.66 #3.0.0.69 #V3.0.0.46
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/sh", "-c"]
-        args: ["mkdir automation && git config --global http.sslVerify false && git clone --depth 1 https://$(GITEA_UN):$(GITEA_PW)@git.cloudsolutions.com.sa/Automation/Automation.git /app/automation/ && python3 main.py"]
-        resources:
-          #limits:
-            #cpu: 750m
-            #memory: 3Gi
-          requests:
-            cpu: 128m
-            memory: 128Mi
-        env:
-        - name: owner
-          value: "CSI_DEV"
-        - name: repo
-          value: "CSI_DEV"
-        - name: filePath
-          value: "kustomization.yaml"
-        - name: active_profile
-          valueFrom:
-            configMapKeyRef:
-              key: activeProfile
-              name: service-configs
-        - name: SPRING_JPA_HIBERNATE_DIALECT
-          valueFrom:
-            configMapKeyRef:
-              key: db-dialect
-              name: service-configs
-        - name: SPRING_JPA_DATABASE-PLATFORM
-          valueFrom:
-            configMapKeyRef:
-              key: db-dialect
-              name: service-configs
-        - name: configserver
-          valueFrom:
-            configMapKeyRef:
-              key: config_server
-              name: service-configs
-        - name: hostname
-          value: csi-java-ehr-config
-        envFrom:
-        - configMapRef:
-            name: service-configs
-        - secretRef:
-            name: service-configs-secret
-        - configMapRef:
-            name: init-database-configs
-        - secretRef:
-            name: init-database-secrets
-      restartPolicy: Never
-      imagePullSecrets:
-      - name: regcred      
\ No newline at end of file
diff --git a/UAT/rms/csi-rms-morgue-java-service/kustomization.yaml b/UAT/rms/csi-rms-morgue-java-service/kustomization.yaml
index 3c777a3..c40e276 100644
--- a/UAT/rms/csi-rms-morgue-java-service/kustomization.yaml
+++ b/UAT/rms/csi-rms-morgue-java-service/kustomization.yaml
@@ -19,20 +19,13 @@ patchesJson6902:
     group: batch
     version: v1
     kind: Job
-    name: .*
+    name: sync-presync
   patch: |
     - op: add
       path: /spec/template/spec/containers/0/env/-
       value:
         name: CSI_PROJECT_NAME
         value: "csi-rms-morgue-java-service"
-
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: sync-presync
-  patch: |
     - op: replace
       path: /metadata/name
       value: before-csi-rms-morgue-java-service
@@ -43,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: "csi-rms-morgue-java-service"
     - op: replace
       path: /metadata/name
       value: after-csi-rms-morgue-java-service
diff --git a/UAT/rms/csi-rms-morgue-java-service/presync.yaml b/UAT/rms/csi-rms-morgue-java-service/presync.yaml
deleted file mode 100644
index 0f55174..0000000
--- a/UAT/rms/csi-rms-morgue-java-service/presync.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: sync-presync
-  namespace: moh-uat
-  annotations:
-    argocd.argoproj.io/hook: PostSync
-    # argocd.argoproj.io/hook-delete-policy: HookSucceeded
-spec:
-  backoffLimit: 3
-  template:
-    spec:
-      containers:
-      - name: presync-pod
-        image: registry.cloudsolutions.com.sa/vida-qa/csi-data-migration-initiator:4.0.56.17
-        imagePullPolicy: IfNotPresent     
-        resources:
-          limits:
-            cpu: 500m
-            memory: 3Gi
-          requests:
-            cpu: 250m
-            memory: 256Mi
-        env:
-        # - name: owner
-        #   value: "CSI_DEV"
-        # - name: repo
-        #   value: "CSI_DEV"
-        # - name: filePath
-        #   value: "kustomization.yaml"
-        - name: MIGRATION_TYPE
-          value: "1" 
-        envFrom:
-        - configMapRef:
-            name: service-configs
-        - secretRef:
-            name: service-configs-secret
-        - configMapRef:
-            name: init-database-configs
-        - secretRef:
-            name: init-database-secrets
-      restartPolicy: Never
-      imagePullSecrets:
-      - name: regcred
\ No newline at end of file
diff --git a/UAT/rms/csi-rms-ui/kustomization.yaml b/UAT/rms/csi-rms-ui/kustomization.yaml
index e0fca2b..c0e0657 100644
--- a/UAT/rms/csi-rms-ui/kustomization.yaml
+++ b/UAT/rms/csi-rms-ui/kustomization.yaml
@@ -6,29 +6,23 @@ resources:
 
 images:
 - name: harbor.moh.gov.sa/vidamoh/rms-ui
-  newName: registry.cloudsolutions.com.sa/vida-qa/csi-rms-ui
-  newTag: V4.0.2507_W1-237_hf #V4.0.2507_Int-190_qa
+  newName: registry.cloudsolutions.com.sa/dev/csi-rms-ui
+  newTag: V4.0.2507_Int_latest
 
 namespace: csi-uat
-patchesJson6902:
+
+patchesJson6902:    
 - target:
     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: "csi-rms-ui"
-    
-- target:
-    group: batch
-    version: v1
-    kind: Job
-    name: sync-presync
-  patch: |-
     - op: replace
       path: /metadata/name
       value: before-csi-rms-ui
@@ -39,6 +33,11 @@ patchesJson6902:
     kind: Job
     name: sync-postsync
   patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: CSI_PROJECT_NAME
+        value: "csi-rms-ui"
     - op: replace
       path: /metadata/name
       value: after-csi-rms-ui