diff --git a/3.5.0/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.0/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.0/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.0/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.0/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.0/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.0/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.0/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.1/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.1/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.1/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.1/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.1/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.1/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.1/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.1/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.2/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.2/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.2/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.2/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.2/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.2/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.2/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.2/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.3/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.3/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.3/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.3/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.3/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.3/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.3/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.3/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.4/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.4/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.4/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.4/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.4/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.4/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.4/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.4/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.5/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.5/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.5/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.5/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.5/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.5/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.5/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.5/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.6/scala2.12-java11-ubuntu/entrypoint.sh b/3.5.6/scala2.12-java11-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.6/scala2.12-java11-ubuntu/entrypoint.sh
+++ b/3.5.6/scala2.12-java11-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/3.5.6/scala2.12-java17-ubuntu/entrypoint.sh b/3.5.6/scala2.12-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/3.5.6/scala2.12-java17-ubuntu/entrypoint.sh
+++ b/3.5.6/scala2.12-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/4.0.0-preview1/scala2.13-java17-ubuntu/entrypoint.sh b/4.0.0-preview1/scala2.13-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/4.0.0-preview1/scala2.13-java17-ubuntu/entrypoint.sh
+++ b/4.0.0-preview1/scala2.13-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/4.0.0-preview1/scala2.13-java21-ubuntu/entrypoint.sh b/4.0.0-preview1/scala2.13-java21-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/4.0.0-preview1/scala2.13-java21-ubuntu/entrypoint.sh
+++ b/4.0.0-preview1/scala2.13-java21-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/4.0.0-preview2/scala2.13-java17-ubuntu/entrypoint.sh b/4.0.0-preview2/scala2.13-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/4.0.0-preview2/scala2.13-java17-ubuntu/entrypoint.sh
+++ b/4.0.0-preview2/scala2.13-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/4.0.0-preview2/scala2.13-java21-ubuntu/entrypoint.sh b/4.0.0-preview2/scala2.13-java21-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/4.0.0-preview2/scala2.13-java21-ubuntu/entrypoint.sh
+++ b/4.0.0-preview2/scala2.13-java21-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/4.0.0/scala2.13-java17-ubuntu/entrypoint.sh b/4.0.0/scala2.13-java17-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/4.0.0/scala2.13-java17-ubuntu/entrypoint.sh
+++ b/4.0.0/scala2.13-java17-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/4.0.0/scala2.13-java21-ubuntu/entrypoint.sh b/4.0.0/scala2.13-java21-ubuntu/entrypoint.sh
index c576d8f..d1163e5 100755
--- a/4.0.0/scala2.13-java21-ubuntu/entrypoint.sh
+++ b/4.0.0/scala2.13-java21-ubuntu/entrypoint.sh
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi
diff --git a/entrypoint.sh.template b/entrypoint.sh.template
index c576d8f..d1163e5 100644
--- a/entrypoint.sh.template
+++ b/entrypoint.sh.template
@@ -33,7 +33,7 @@ attempt_setup_fake_passwd_entry() {
           NSS_WRAPPER_GROUP="$(mktemp)"
           export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
           local mygid; mygid="$(id -g)"
-          printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+          printf 'spark:x:%s:%s:%s:%s:/bin/false\n' "$myuid" "$mygid" "${SPARK_USER_NAME:-anonymous uid}" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
           printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
           break
         fi