diff --git a/tools/docker-images/clp-package/build.sh b/tools/docker-images/clp-package/build.sh
index a7d19d997a..9abbb92f1e 100755
--- a/tools/docker-images/clp-package/build.sh
+++ b/tools/docker-images/clp-package/build.sh
@@ -48,7 +48,10 @@ if [[ -s "$temp_iid_file" ]]; then
     new_image_id="$(<"$temp_iid_file")"
     echo "$new_image_id" > "$iid_file"
 
-    user="${USER:-$(id -un 2>/dev/null || whoami 2>/dev/null || echo unknown)}"
+    user="${USER:-$(whoami 2>/dev/null)}" \
+        || user=$(id --user --name 2>/dev/null) \
+        || user=$(id --user 2>/dev/null) \
+        || user="unknown";
     short_id="${new_image_id#sha256:}"
     short_id="${short_id:0:4}"
     docker tag "$new_image_id" "clp-package:dev-${user}-${short_id}"