diff --git a/smoke-tests/images/servlet/build.gradle.kts b/smoke-tests/images/servlet/build.gradle.kts
index 8cf01a007e44..3614722c487b 100644
--- a/smoke-tests/images/servlet/build.gradle.kts
+++ b/smoke-tests/images/servlet/build.gradle.kts
@@ -1,6 +1,6 @@
 import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
 import com.bmuschko.gradle.docker.tasks.image.DockerPushImage
-import org.gradle.configurationcache.extensions.capitalized
+import org.apache.commons.lang.StringUtils
 
 plugins {
   id("otel.spotless-conventions")
@@ -104,7 +104,7 @@ tasks {
         continue
       }
       println(server)
-      val serverName = server.capitalized()
+      val serverName = StringUtils.capitalize(server)
       for (entry in matrices) {
         for (version in entry.version) {
           val dotIndex = version.indexOf('.')
diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile
index dd03cebd1e40..8831c9b4756b 100644
--- a/smoke-tests/images/servlet/src/wildfly.dockerfile
+++ b/smoke-tests/images/servlet/src/wildfly.dockerfile
@@ -8,7 +8,7 @@ ARG baseDownloadUrl
 # The user ID 1000 is the default for the first "regular" user on Fedora/RHEL,
 # so there is a high chance that this ID will be equal to the current user
 # making it easier to use volumes (no permission issues)
-RUN groupadd -r jboss -g 1000 && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss && \
+RUN groupadd -r jboss -g 1001 && useradd -u 1001 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss && \
     chmod 755 /opt/jboss
 
 # Set the working directory to jboss' user home directory