diff --git a/CHANGELOG.md b/CHANGELOG.md
index 952c94a74..f1526a646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ All notable changes to this project will be documented in this file.
 - nifi: update patch allowing to bypass host header validation starting with NiFi 2.4.0 ([#1125]).
 - BREAKING: kcat: Stop building kcat image ([#1124]).
 - containerdebug updated to 0.2.0 ([#1128])
+- Build Hadoop as `stackable` and configure the Stackable Nexus build-repo for the `root` user ([#1133])
 
 ### Fixed
 
@@ -150,6 +151,7 @@ All notable changes to this project will be documented in this file.
 [#1126]: https://github.com/stackabletech/docker-images/pull/1126
 [#1127]: https://github.com/stackabletech/docker-images/pull/1127
 [#1128]: https://github.com/stackabletech/docker-images/pull/1128
+[#1133]: https://github.com/stackabletech/docker-images/pull/1133
 
 ## [25.3.0] - 2025-03-21
 
diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile
index c8d0f6877..9e7a57723 100644
--- a/hadoop/Dockerfile
+++ b/hadoop/Dockerfile
@@ -58,6 +58,7 @@ chmod -x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
 ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
 EOF
 
+USER ${STACKABLE_USER_UID}
 WORKDIR /build
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/patches/patchable.toml /build/src/hadoop/stackable/patches/patchable.toml
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/patches/${PRODUCT} /build/src/hadoop/stackable/patches/${PRODUCT}
diff --git a/java-devel/Dockerfile b/java-devel/Dockerfile
index a633ac9b2..006a1cb8f 100644
--- a/java-devel/Dockerfile
+++ b/java-devel/Dockerfile
@@ -61,6 +61,7 @@ RUN microdnf update && \
 ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
 
 COPY --chown=${STACKABLE_USER_UID}:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml
+COPY --chown=${STACKABLE_USER_UID}:0 java-devel/stackable/settings.xml /root/.m2/settings.xml
 
 # Mitigation for CVE-2021-44228 (Log4Shell)
 # This variable is supported as of Log4j version 2.10 and