diff --git a/Dockerfile b/Dockerfile
index f5ddbb7db145c4032613df15e0d3cf4b1f1a0f64..602070723d193e54aaeb2f6ef9734e813e87ff12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # base image to build a JRE
-FROM amazoncorretto:17.0.3-alpine as corretto-jdk
+FROM eclipse-temurin:21-jdk-alpine as corretto-jdk
 
 # required for strip-debug to work
 RUN apk add --no-cache binutils
@@ -32,8 +32,8 @@ ENV GID=$AGID
 ARG BUILD_NUMBER=
 
 # Create docker group identical to host
-RUN addgroup -g $GID -S docker
-RUN adduser --no-create-home -u 1000 -G docker -D $USER
+RUN addgroup --gid $GID --system docker
+RUN adduser --no-create-home -u 1000 --ingroup docker --disabled-password $USER
 
 # Prepare environment.
 # Create needed folders