diff --git a/builders/Linux/entrypoint.sh b/builders/Linux/entrypoint.sh
index e3dc1a6..3b0965d 100755
--- a/builders/Linux/entrypoint.sh
+++ b/builders/Linux/entrypoint.sh
@@ -1,16 +1,9 @@
 #!/usr/bin/env bash
 
-OLD_UID=$(id -u)
+OLD_UID=$(id -u mediafx)
 NEW_UID=$(stat -c "%u" /mediafx/CMakeLists.txt)
-if [ ! -z "$NEW_UID" -a "$OLD_UID" != "$NEW_UID" ]; then
-    echo usermod -u "$NEW_UID" -o $(id -u -n) #XXX
-    usermod -u "$NEW_UID" -o $(id -u -n)
-fi
-
-OLD_GID=$(id -g)
-NEW_GID=$(stat -c "%g" /mediafx/CMakeLists.txt)
-if [ ! -z "$NEW_GID" -a "$OLD_GID" != "$NEW_GID" ]; then
-    groupmod -g "$NEW_GID" -o $(id -g -n)
+if [ ! -z "$NEW_UID" -a "$NEW_UID" != "0" -a "$OLD_UID" != "$NEW_UID" ]; then
+    usermod -u "$NEW_UID" -o mediafx
 fi
 
 mkdir -p /mediafx/build/Linux && chown -R mediafx /mediafx/build/Linux