diff --git a/podctl/visitors/user.py b/podctl/visitors/user.py
index 540a666..7b99f46 100644
--- a/podctl/visitors/user.py
+++ b/podctl/visitors/user.py
@@ -25,10 +25,10 @@ class User:
     def build(self, script):
         script.append(f'''
             if {script._run('id ' + str(self.uid))}; then
-                i=$({script._run('id -n ' + str(self.uid))})
-                {script._run('usermod --home-dir ' + self.home + ' --no-log-init ' + str(self.uid) + ' $i')}
+                i=$({script._run('id -gn ' + str(self.uid))})
+                {script._run('usermod -d ' + self.home + ' -l ' + self.username + ' $i')}
             else
-                {script._run('useradd --home-dir ' + self.home + ' --uid ' + str(self.uid) + ' ' + self.username)}
+                {script._run('useradd -d ' + self.home + ' -u ' + str(self.uid) + ' ' + self.username)}
             fi
         ''')  # noqa
         self.user_created = True
diff --git a/tests/test_build_user.sh b/tests/test_build_user.sh
index ce008f4..bee2438 100644
--- a/tests/test_build_user.sh
+++ b/tests/test_build_user.sh
@@ -33,10 +33,10 @@ buildah run --user root $ctr -- apk upgrade
 buildah run --user root $ctr -- apk add shadow
 echo "User.build"
 if buildah run $ctr -- id 1000; then
-    i=$(buildah run $ctr -- id -n 1000)
-    buildah run $ctr -- usermod --home-dir /app --no-log-init 1000 $i
+    i=$(buildah run $ctr -- id -gn 1000)
+    buildah run $ctr -- usermod -d /app -l app $i
 else
-    buildah run $ctr -- useradd --home-dir /app --uid 1000 app
+    buildah run $ctr -- useradd -d /app -u 1000 app
 fi
 echo "User.post_build"
 buildah config --user app $ctr
\ No newline at end of file