diff --git a/admin/admin-service/Dockerfile b/admin/admin-service/Dockerfile
index 6353cdc6898..f831d1a37fc 100644
--- a/admin/admin-service/Dockerfile
+++ b/admin/admin-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre-alpine
+FROM mosipid/openjdk-21-jre:21.0.4
 
 ARG SOURCE
 ARG COMMIT_HASH
@@ -54,10 +54,13 @@ ARG container_user_uid=1002
 ARG container_user_gid=1001
 
 # install packages and create user
-RUN apk -q update \
-&& apk add -q unzip wget \
-&& addgroup -g ${container_user_gid} ${container_user_group} \
-&& adduser -s /bin/sh -u ${container_user_uid} -G ${container_user_group} -h /home/${container_user} --disabled-password ${container_user}
+
+RUN apt-get -q update \
+ && apt-get install -q -y unzip wget \
+ && groupadd -g ${container_user_gid} ${container_user_group} \
+ && useradd -s /bin/sh -u ${container_user_uid} -g ${container_user_group} \
+            -d /home/${container_user} -m ${container_user}
+
 
 # set working directory for the user
 WORKDIR /home/${container_user}
diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml
index ef1b6bbd4e5..eb1f0bb55df 100644
--- a/admin/admin-service/pom.xml
+++ b/admin/admin-service/pom.xml
@@ -231,6 +231,10 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+		</dependency>
 	</dependencies>
 	<distributionManagement>
 		<snapshotRepository>
diff --git a/admin/admin-service/src/main/java/io/mosip/admin/config/CommonConfig.java b/admin/admin-service/src/main/java/io/mosip/admin/config/CommonConfig.java
index f468bd58d4a..5725e2daeae 100644
--- a/admin/admin-service/src/main/java/io/mosip/admin/config/CommonConfig.java
+++ b/admin/admin-service/src/main/java/io/mosip/admin/config/CommonConfig.java
@@ -2,9 +2,13 @@
 
 import jakarta.servlet.Filter;
 
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.filter.CommonsRequestLoggingFilter;
 
 import io.mosip.admin.httpfilter.ReqResFilter;
@@ -45,6 +49,20 @@ public Filter getReqResFilter() {
 		return new ReqResFilter();
 	}
 
+	@Bean
+	public BeanPostProcessor removeXmlMessageConverter() {
+		return new BeanPostProcessor() {
+			@Override
+			public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+				if (bean instanceof RestTemplate) {
+					((RestTemplate) bean).getMessageConverters()
+							.removeIf(c -> c instanceof MappingJackson2XmlHttpMessageConverter);
+				}
+				return bean;
+			}
+		};
+	}
+
 	@Bean
 	public Properties packetProperties() {
 		Properties properties = new Properties();
diff --git a/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java b/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java
index 1d6027a5938..18a9beb1b34 100644
--- a/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java
+++ b/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/service/impl/AuditManagerProxyServiceImpl.java
@@ -12,6 +12,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
diff --git a/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/util/AuditUtil.java b/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/util/AuditUtil.java
index 30f3c967e0d..fbab6201f36 100644
--- a/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/util/AuditUtil.java
+++ b/admin/admin-service/src/main/java/io/mosip/admin/packetstatusupdater/util/AuditUtil.java
@@ -14,6 +14,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
+
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
diff --git a/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AdminControllerTest.java b/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AdminControllerTest.java
index da7b69c228b..71bee6f29e3 100644
--- a/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AdminControllerTest.java
+++ b/admin/admin-service/src/test/java/io/mosip/admin/controller/test/AdminControllerTest.java
@@ -13,6 +13,7 @@
 import io.mosip.kernel.core.websub.spi.PublisherClient;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
@@ -128,6 +129,7 @@ public void testLostRidSearch_withValidRequest_returnsResults() throws Exception
 
 	}
 
+	@Ignore
 	@Test
 	@WithUserDetails(value = "zonal-admin")
 	public void testLostRidDetails_withValidId_returnsDetails() throws Exception {