diff --git a/Dockerfile b/Dockerfile
index 1e82f45..1878015 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,16 +17,20 @@ COPY src ./src
 RUN mvn clean package -DskipTests
 
 ## Stage 2 : Create runtime image
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18
+FROM eclipse-temurin:17-jre-alpine
 
 ENV LANGUAGE='en_US:en'
 
+# Create app user and directories
+RUN addgroup -g 185 -S appuser && adduser -u 185 -S appuser -G appuser
+RUN mkdir -p /deployments && chown -R appuser:appuser /deployments
+
 # Copy the uber-jar (single JAR with all dependencies)
 # The build uses -Dquarkus.package.type=uber-jar which creates a single *-runner.jar
-COPY --from=build --chown=185 /build/target/*-runner.jar /deployments/app.jar
+COPY --from=build --chown=appuser:appuser /build/target/*-runner.jar /deployments/app.jar
 
 EXPOSE 8080
-USER 185
+USER appuser
 
 ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"