diff --git a/server/Dockerfile b/server/Dockerfile
index 6214644cfd..59e64f44d9 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
-FROM registry.access.redhat.com/ubi8-minimal
-
+FROM alfresco/alfresco-base-java:jre11-rockylinux8-202203101229
+ENV LC_ALL=C
 ENV KEYCLOAK_VERSION 16.1.1
 ENV JDBC_POSTGRES_VERSION 42.2.5
 ENV JDBC_MYSQL_VERSION 8.0.22
@@ -11,10 +11,6 @@ ENV PROXY_ADDRESS_FORWARDING true
 ENV JBOSS_HOME /opt/jboss/keycloak
 ENV LANG en_US.UTF-8
 
-USER root
-
-RUN microdnf update -y && microdnf install -y glibc-langpack-en hostname java-11-openjdk-headless openssl tar which && microdnf clean all
-
 COPY temp/keycloak /opt/jboss/keycloak
 ADD tools /opt/jboss/tools
 RUN /opt/jboss/tools/build-keycloak.sh
diff --git a/server/Makefile b/server/Makefile
index 29c1d7b8f0..bad3a6a7f5 100755
--- a/server/Makefile
+++ b/server/Makefile
@@ -2,7 +2,7 @@ include build.properties
 export $(shell sed 's/=.*//' build.properties)
 
 IMAGE_NAME							:=alfresco/alfresco-identity-service:$(IDENTITY_VERSION)
-IMAGE_NAME_WITH_BASE_OS				:=$(IMAGE_NAME)-java-11-openjdk-ubi8-minimal
+IMAGE_NAME_WITH_BASE_OS				:=$(IMAGE_NAME)-java-11-openjdk-rockylinux8
 IMAGE_NAME_WITH_BASE_OS_AND_SHA		:=$(IMAGE_NAME_WITH_BASE_OS)-$(shell git rev-parse HEAD | cut -c1-12)
 export IMAGE_NAME
 export IMAGE_NAME_WITH_BASE_OS