diff --git a/deploy/copy_cm.sh b/deploy/copy_cm.sh
deleted file mode 100755
index fdcb6430..00000000
--- a/deploy/copy_cm.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copy configmaps from other namespaces
-# DST_NS: Destination namespace
-
-function copying_cm() {
-  UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh
-  COPY_UTIL=./copy_cm_func.sh
-  DST_NS=resident
-
-  wget -q $UTIL_URL -O copy_cm_func.sh && chmod +x copy_cm_func.sh
-
-  $COPY_UTIL configmap global default $DST_NS
-  $COPY_UTIL configmap artifactory-share artifactory $DST_NS
-  $COPY_UTIL configmap config-server-share config-server $DST_NS
-  return 0
-}
-
-# set commands for error handling.
-set -e
-set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
-set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
-set -o errtrace  # trace ERR through 'time command' and other functions
-set -o pipefail  # trace ERR through pipes
-copying_cm   # calling function
diff --git a/deploy/copy_cm_func.sh b/deploy/copy_cm_func.sh
new file mode 100755
index 00000000..185ae3e5
--- /dev/null
+++ b/deploy/copy_cm_func.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copy configmap and secret from one namespace to another.
+# ./copy_cm_func.sh <resource> <configmap_name> <source_namespace> <destination_namespace> [name]
+# Parameters:
+#   resource: configmap|secret
+#   name: Optional new name of the configmap or secret in destination namespace.  This may be needed if there is
+#         clash of names
+
+if [ $1 = "configmap" ]
+then
+  RESOURCE=configmap
+elif [ $1 = "secret" ]
+then
+  RESOURCE=secret
+else
+  echo "Incorrect resource $1. Exiting.."
+  exit 1
+fi
+
+
+if [ $# -ge 5 ]
+then
+   kubectl -n $4 delete --ignore-not-found=true $RESOURCE $5
+   kubectl -n $3 get $RESOURCE $2 -o yaml | sed "s/namespace: $3/namespace: $4/g" | sed "s/name: $2/name: $5/g" | kubectl -n $4 create -f -  
+else
+   kubectl -n $4 delete --ignore-not-found=true $RESOURCE $2
+   kubectl -n $3 get $RESOURCE $2 -o yaml | sed "s/namespace: $3/namespace: $4/g" |  kubectl -n $4 create -f -  
+fi 
+
+
+
+
+
diff --git a/deploy/copy_secrets.sh b/deploy/copy_secrets.sh
deleted file mode 100755
index 92d4db05..00000000
--- a/deploy/copy_secrets.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Copy secrets from other namespaces
-# DST_NS: Destination namespace
-
-function copying_secrets() {
-  UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh
-  COPY_UTIL=./copy_cm_func.sh
-  DST_NS=resident
-
-  wget -q $UTIL_URL -O copy_cm_func.sh && chmod +x copy_cm_func.sh
-
-  $COPY_UTIL secret keycloak-client-secrets keycloak $DST_NS
-  return 0
-}
-
-# set commands for error handling.
-set -e
-set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
-set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
-set -o errtrace  # trace ERR through 'time command' and other functions
-set -o pipefail  # trace ERR through pipes
-copying_secrets   # calling function
diff --git a/deploy/README.md b/deploy/resident-ui/README.md
similarity index 91%
rename from deploy/README.md
rename to deploy/resident-ui/README.md
index 2613aa7b..c47e58c4 100644
--- a/deploy/README.md
+++ b/deploy/resident-ui/README.md
@@ -4,6 +4,17 @@
 ```sh
 ./install.sh
 ```
+
+## Restart
+```sh
+./restart.sh
+```
+
+## Delete
+```sh
+./delete.sh
+```
+
 * During the execution of the `install.sh` script, a prompt appears requesting information regarding the presence of a public domain and a valid SSL certificate on the server.
 * If the server lacks a public domain and a valid SSL certificate, it is advisable to select the `n` option. Opting it will enable the `init-container` with an `emptyDir` volume and include it in the deployment process.
 * The init-container will proceed to download the server's self-signed SSL certificate and mount it to the specified location within the container's Java keystore (i.e., `cacerts`) file.
diff --git a/deploy/certs_upload/postman/README.md b/deploy/resident-ui/certs_upload/postman/README.md
similarity index 100%
rename from deploy/certs_upload/postman/README.md
rename to deploy/resident-ui/certs_upload/postman/README.md
diff --git a/deploy/certs_upload/postman/collection.json b/deploy/resident-ui/certs_upload/postman/collection.json
similarity index 100%
rename from deploy/certs_upload/postman/collection.json
rename to deploy/resident-ui/certs_upload/postman/collection.json
diff --git a/deploy/certs_upload/postman/env.json b/deploy/resident-ui/certs_upload/postman/env.json
similarity index 100%
rename from deploy/certs_upload/postman/env.json
rename to deploy/resident-ui/certs_upload/postman/env.json
diff --git a/deploy/delete.sh b/deploy/resident-ui/delete.sh
similarity index 100%
rename from deploy/delete.sh
rename to deploy/resident-ui/delete.sh
diff --git a/deploy/install.sh b/deploy/resident-ui/install.sh
similarity index 90%
rename from deploy/install.sh
rename to deploy/resident-ui/install.sh
index d520f718..5e1a8422 100755
--- a/deploy/install.sh
+++ b/deploy/resident-ui/install.sh
@@ -8,6 +8,7 @@ fi
 
 NS=resident
 RESIDENT_UI_CHART_VERSION=0.0.1-develop
+COPY_UTIL=../copy_cm_func.sh
 
 echo Create $NS namespace
 kubectl create ns $NS
@@ -18,12 +19,13 @@ function installing_resident_ui() {
   helm repo update
 
   echo Copy configmaps
-  sed -i 's/\r$//' copy_cm.sh
-  ./copy_cm.sh
+  $COPY_UTIL configmap global default $NS
+  $COPY_UTIL configmap artifactory-share artifactory $NS
+  $COPY_UTIL configmap config-server-share config-server $NS
 
   echo Copy secrets
-  sed -i 's/\r$//' copy_secrets.sh
-  ./copy_secrets.sh
+  $COPY_UTIL secret keycloak-client-secrets keycloak $NS
+
   echo Setting up dummy values for Resident OIDC Client ID
   kubectl create secret generic resident-oidc-onboarder-key -n $NS --from-literal=resident-oidc-clientid='' --dry-run=client -o yaml | kubectl apply -f -
   ./copy_cm_func.sh secret resident-oidc-onboarder-key resident config-server
diff --git a/deploy/restart.sh b/deploy/resident-ui/restart.sh
similarity index 100%
rename from deploy/restart.sh
rename to deploy/resident-ui/restart.sh
diff --git a/deploy/resident-uitestrig/README.md b/deploy/resident-uitestrig/README.md
new file mode 100644
index 00000000..00b2177f
--- /dev/null
+++ b/deploy/resident-uitestrig/README.md
@@ -0,0 +1,32 @@
+# UITESTRIG
+
+## Introduction
+UITESTRIG will test end-to-end functional flows involving multiple UI modules.
+
+## Install
+* Install
+```sh
+./install.sh
+```
+
+## Uninstall
+* To uninstall UITESTRIG, run `delete.sh` script.
+```sh
+./delete.sh 
+```
+
+## Run UITESTRIG manually
+
+#### CLI
+* Download Kubernetes cluster `kubeconfig` file from `rancher dashboard` to your local.
+* Install `kubectl` package to your local machine.
+* Run UITESTRIG manually via CLI by creating a new job from an existing k8s cronjob.
+  ```
+  kubectl --kubeconfig=<k8s-config-file> -n UITESTRIG create job --from=cronjob/<cronjob-name> <job-name>
+  ```
+  example:
+  ```
+  kubectl --kubeconfig=/home/xxx/Downloads/qa4.config -n UITESTRIG create job --from=cronjob/cronjob-uitestrig cronjob-uitestrig
+  ```
+
+  
diff --git a/deploy/resident-uitestrig/delete.sh b/deploy/resident-uitestrig/delete.sh
new file mode 100755
index 00000000..850ba22b
--- /dev/null
+++ b/deploy/resident-uitestrig/delete.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Uninstalls uitestrig
+## Usage: ./delete.sh [kubeconfig]
+
+if [ $# -ge 1 ] ; then
+  export KUBECONFIG=$1
+fi
+
+function deleting_uitestrig() {
+  NS=resident
+  while true; do
+      read -p "Are you sure you want to delete uitestrig helm charts?(Y/n) " yn
+      if [ $yn = "Y" ]
+        then
+          helm -n $NS delete resident-uitestrig
+          break
+        else
+          break
+      fi
+  done
+  return 0
+}
+
+# set commands for error handling.
+set -e
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errtrace  # trace ERR through 'time command' and other functions
+set -o pipefail  # trace ERR through pipes
+deleting_uitestrig  # calling function
\ No newline at end of file
diff --git a/deploy/resident-uitestrig/install.sh b/deploy/resident-uitestrig/install.sh
new file mode 100755
index 00000000..de469b06
--- /dev/null
+++ b/deploy/resident-uitestrig/install.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Installs uitestrig automation
+## Usage: ./install.sh [kubeconfig]
+
+if [ $# -ge 1 ] ; then
+  export KUBECONFIG=$1
+fi
+
+NS=resident
+CHART_VERSION=0.0.1-develop
+COPY_UTIL=../copy_cm_func.sh
+
+echo Create $NS namespace
+kubectl create ns $NS
+
+function installing_uitestrig() {
+  ENV_NAME=$( kubectl -n default get cm global -o json |jq -r '.data."installation-domain"')
+
+  read -p "Please enter the time(hr) to run the cronjob every day (time: 0-23) : " time
+  if [ -z "$time" ]; then
+     echo "ERROR: Time cannot be empty; EXITING;";
+     exit 1;
+  fi
+  if ! [ $time -eq $time ] 2>/dev/null; then
+     echo "ERROR: Time $time is not a number; EXITING;";
+     exit 1;
+  fi
+  if [ $time -gt 23 ] || [ $time -lt 0 ] ; then
+     echo "ERROR: Time should be in range ( 0-23 ); EXITING;";
+     exit 1;
+  fi
+
+  echo "Do you have public domain & valid SSL? (Y/n) "
+  echo "Y: if you have public domain & valid ssl certificate"
+  echo "n: if you don't have public domain & valid ssl certificate"
+  read -p "" flag
+
+  if [ -z "$flag" ]; then
+    echo "'flag' was provided; EXITING;"
+    exit 1;
+  fi
+  ENABLE_INSECURE=''
+  if [ "$flag" = "n" ]; then
+    ENABLE_INSECURE='--set uitestrig.configmaps.uitestrig.ENABLE_INSECURE=true';
+  fi
+
+  echo Istio label
+  kubectl label ns $NS istio-injection=disabled --overwrite
+  helm repo update
+
+  echo Copy configmaps
+  $COPY_UTIL configmap global default $NS
+  $COPY_UTIL configmap keycloak-host keycloak $NS
+  $COPY_UTIL configmap artifactory-share artifactory $NS
+  $COPY_UTIL configmap config-server-share config-server $NS
+
+  echo Copy secrets
+  $COPY_UTIL secret keycloak-client-secrets keycloak $NS
+  $COPY_UTIL secret s3 s3 $NS
+  $COPY_UTIL secret postgres-postgresql postgres $NS
+
+  DB_HOST=$( kubectl -n default get cm global -o json  |jq -r '.data."mosip-api-internal-host"' )
+  PMP_HOST=$(kubectl -n default get cm global -o json  |jq -r '.data."mosip-pmp-host"')
+  ADMIN_HOST=$(kubectl -n default get cm global -o json  |jq -r '.data."mosip-admin-host"')
+  RESIDENT_HOST=$(kubectl -n default get cm global -o json  |jq -r '.data."mosip-resident-host"')
+  API_INTERNAL_HOST=$( kubectl -n default get cm global -o json  |jq -r '.data."mosip-api-internal-host"' )
+
+  echo Installing resident uitestrig
+  helm -n $NS install resident-uitestrig mosip/uitestrig \
+  --set crontime="0 $time * * *" \
+  -f values.yaml  \
+  --version $CHART_VERSION \
+  --set uitestrig.configmaps.s3.s3-host='http://minio.minio:9000' \
+  --set uitestrig.configmaps.s3.s3-user-key='admin' \
+  --set uitestrig.configmaps.s3.s3-region='' \
+  --set uitestrig.configmaps.db.db-server="$DB_HOST" \
+  --set uitestrig.configmaps.db.db-su-user="postgres" \
+  --set uitestrig.configmaps.db.db-port="5432" \
+  --set uitestrig.configmaps.uitestrig.apiInternalEndPoint="https://$API_INTERNAL_HOST" \
+  --set uitestrig.configmaps.uitestrig.apiEnvUser="$API_INTERNAL_HOST" \
+  --set uitestrig.configmaps.uitestrig.PmpPortalPath="https://$PMP_HOST" \
+  --set uitestrig.configmaps.uitestrig.adminPortalPath="https://$ADMIN_HOST" \
+  --set uitestrig.configmaps.uitestrig.residentPortalPath="https://$RESIDENT_HOST" \
+  --set uitestrig.configmaps.uitestrig.NS="$NS" \
+  $ENABLE_INSECURE
+
+  echo Installed resident uitestrig
+  return 0
+}
+
+# set commands for error handling.
+set -e
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errtrace  # trace ERR through 'time command' and other functions
+set -o pipefail  # trace ERR through pipes
+installing_uitestrig   # calling function
\ No newline at end of file
diff --git a/deploy/resident-uitestrig/values.yaml b/deploy/resident-uitestrig/values.yaml
new file mode 100644
index 00000000..9e02676b
--- /dev/null
+++ b/deploy/resident-uitestrig/values.yaml
@@ -0,0 +1,7 @@
+modules:
+  - name: residentui
+    enabled: true
+    image:
+      registry: docker.io
+      repository: mosipqa/residenttest
+      tag: develop