diff --git a/jdk23/Dockerfile b/jdk23/Dockerfile
index 2919d865..6d87de69 100644
--- a/jdk23/Dockerfile
+++ b/jdk23/Dockerfile
@@ -5,9 +5,11 @@ CMD ["gradle"]
 ENV GRADLE_HOME /opt/gradle
 
 RUN set -o errexit -o nounset \
-    && echo "Adding gradle user and group" \
-    && groupadd --system --gid 1000 gradle \
-    && useradd --system --gid gradle --uid 1000 --shell /bin/bash --create-home gradle \
+    && echo "Renaming ubuntu user and group to gradle" \
+    && groupmod --new-name gradle ubuntu \
+    && mkdir /home/gradle \
+    && usermod --login gradle --home /home/gradle --groups gradle ubuntu \
+    && chown gradle /home/gradle \
     && mkdir /home/gradle/.gradle \
     && chown --recursive gradle:gradle /home/gradle \
     && chmod --recursive o+rwx /home/gradle \