diff --git a/helm/admin-ui/.gitignore b/helm/admin-ui/.gitignore
index ee3892e8..f791801b 100644
--- a/helm/admin-ui/.gitignore
+++ b/helm/admin-ui/.gitignore
@@ -1 +1,2 @@
 charts/
+Chart.lock
diff --git a/helm/admin-ui/templates/deployment.yaml b/helm/admin-ui/templates/deployment.yaml
index 22838e00..d8973104 100644
--- a/helm/admin-ui/templates/deployment.yaml
+++ b/helm/admin-ui/templates/deployment.yaml
@@ -33,6 +33,7 @@ spec:
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds | default 60 }}
       {{- if .Values.affinity }}
       affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.affinity "context" $) | nindent 8 }}
       {{- else }}
diff --git a/helm/admin-ui/values.yaml b/helm/admin-ui/values.yaml
index 767506ce..2e63a3dd 100644
--- a/helm/admin-ui/values.yaml
+++ b/helm/admin-ui/values.yaml
@@ -217,7 +217,17 @@ podAnnotations: {}
 
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
-lifecycleHooks: {}
+lifecycleHooks:
+  preStop:
+    exec:
+      command:
+        - sh
+        - -c
+        - sleep 30
+
+## Termination grace perios : the maximum amount of time (in seconds) Kubernetes will wait for a container to gracefully shut down
+terminationGracePeriodSeconds: 60
+
 
 ## Custom Liveness probes for
 ##
@@ -315,8 +325,8 @@ volumePermissions:
   enabled: false
   image:
     registry: docker.io
-    repository: bitnami/bitnami-shell
-    tag: "10"
+    repository: mosipid/os-shell
+    tag: "12-debian-12-r46"
     pullPolicy: Always
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
diff --git a/uitest-admin/Dockerfile b/uitest-admin/Dockerfile
index 5475b9d4..8c6642ce 100644
--- a/uitest-admin/Dockerfile
+++ b/uitest-admin/Dockerfile
@@ -1,53 +1,53 @@
-# Start with a base image that includes Java 21
-FROM openjdk:21-slim
-
-# Install additional dependencies, such as Selenium, Chrome, and kubectl
+# Base image: Java 21 JRE on Alpine
+FROM eclipse-temurin:21-jre-alpine
+# Install dependencies: bash, curl, wget, unzip, Chromium + ChromeDriver, Xvfb, fonts, and common libs
 USER root
-
-RUN apt-get update && \
-    apt-get install -y wget curl unzip xvfb libxi6 libgconf-2-4 chromium chromium-driver
-
-# Install kubectl
-RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
+RUN printf '%s\n' \
+  "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" \
+  "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" \
+  > /etc/apk/repositories \
+  && apk update \
+  && apk add --no-cache \
+     bash curl wget unzip ca-certificates \
+     chromium chromium-chromedriver \
+     xvfb \
+     nss freetype harfbuzz libxi \
+     fontconfig font-dejavu \
+  && fc-cache -f
+
+# Install kubectl (latest stable)
+RUN curl -L -s https://dl.k8s.io/release/stable.txt -o /tmp/kver && \
+    curl -LO "https://dl.k8s.io/release/$(cat /tmp/kver)/bin/linux/amd64/kubectl" && \
     chmod +x kubectl && \
-    mv kubectl /usr/local/bin/kubectl
-
-# Define build-time arguments and labels
+    mv kubectl /usr/local/bin/kubectl && \
+    rm -f /tmp/kver
+# Build-time args and labels
 ARG SOURCE
 ARG COMMIT_HASH
 ARG COMMIT_ID
 ARG BUILD_TIME
-
-# Set labels for metadata
 LABEL source=${SOURCE}
 LABEL commit_hash=${COMMIT_HASH}
 LABEL commit_id=${COMMIT_ID}
 LABEL build_time=${BUILD_TIME}
-
-# Define build-time arguments for user and group
+# Build-time args for user/group
 ARG container_user=mosip
 ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
-
-# Set working directory for the user
+# Working dir
 ENV work_dir=/home/${container_user}/
-
-# Create a new user with specified permissions
-RUN groupadd -g ${container_user_gid} ${container_user_group} \
-    && useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/bash -m ${container_user} -d ${work_dir} \
-    && chown -R ${container_user}:${container_user} /home/${container_user}/  
-
-# Switch to the specified user for the subsequent commands
+# Create non-root user and home
+RUN addgroup -g ${container_user_gid} ${container_user_group} && \
+    adduser -D -u ${container_user_uid} -G ${container_user_group} -s /bin/bash -h ${work_dir} ${container_user} && \
+    chown -R ${container_user}:${container_user_group} ${work_dir}
+# Switch to app user
 USER ${container_user_uid}:${container_user_gid}
-
-# Copy your application files into the container
-COPY --chown=${container_user_uid}:${container_user} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh
-COPY --chown=${container_user}:${container_user} ./src/main/resources/ ${work_dir}/resources/
-COPY --chown=${container_user_uid}:${container_user} ./target/*.jar ${work_dir}
-
-# Set the working directory
+# Copy application files
+COPY --chown=${container_user_uid}:${container_user_gid} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh
+COPY --chown=${container_user}:${container_user_group} ./src/main/resources/ ${work_dir}/resources/
+COPY --chown=${container_user_uid}:${container_user_gid} ./target/*.jar ${work_dir}
+# Set working directory
 WORKDIR /home/${container_user}/
-
-# Entrypoint for the container
-ENTRYPOINT ["/bin/bash", "-c", "./entrypoint.sh"]
+# Entrypoint
+ENTRYPOINT ["/bin/bash", "-c", "./entrypoint.sh"]
\ No newline at end of file