diff --git a/docker-build.sh b/docker-build.sh
index a6bbb80e0..e540d533a 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -39,7 +39,12 @@ createPersistentDockerDataVolume()
     # shellcheck disable=SC2154
     echo "Removing old volumes and containers"
     # shellcheck disable=SC2046
-    ${BUILD_CONFIG[DOCKER]} rm -f $(${BUILD_CONFIG[DOCKER]} ps -a --no-trunc -q -f volume="${BUILD_CONFIG[DOCKER_SOURCE_VOLUME_NAME]}") || true
+    local old_containers=$(${BUILD_CONFIG[DOCKER]} ps -a --no-trunc -q -f volume="${BUILD_CONFIG[DOCKER_SOURCE_VOLUME_NAME]}")
+    if [[ ${old_containers} != "" ]]; then
+      ${BUILD_CONFIG[DOCKER]} rm -f $(old_containers) || true
+    else
+      echo "No old container was found"
+    fi
     ${BUILD_CONFIG[DOCKER]} volume rm -f "${BUILD_CONFIG[DOCKER_SOURCE_VOLUME_NAME]}" || true
 
     # shellcheck disable=SC2154
diff --git a/docker/dockerfile-generator.sh b/docker/dockerfile-generator.sh
index 4865df20a..75abf7f78 100755
--- a/docker/dockerfile-generator.sh
+++ b/docker/dockerfile-generator.sh
@@ -337,7 +337,7 @@ printUserCreate(){
   echo "
 ARG HostUID
 ENV HostUID=\$HostUID
-RUN useradd -u \$HostUID -ms /bin/bash build
+RUN useradd -o -u \$HostUID -ms /bin/bash build
 WORKDIR /openjdk/build
 RUN chown -R build /openjdk/
 USER build" >> "$DOCKERFILE_PATH"