diff --git a/tools/test-popular-containers/build_rootfs.sh b/tools/test-popular-containers/build_rootfs.sh
index 501197949f0..7f5eb5fbfdf 100755
--- a/tools/test-popular-containers/build_rootfs.sh
+++ b/tools/test-popular-containers/build_rootfs.sh
@@ -48,7 +48,6 @@ function make_rootfs {
     systemd-nspawn --timezone=off --pipe -i $IMG /bin/sh <<EOF
 set -x
 . /etc/os-release
-passwd -d root
 case \$ID in
 ubuntu)
     export DEBIAN_FRONTEND=noninteractive
@@ -61,7 +60,15 @@ alpine)
     rc-update add local default
     echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >>/etc/inittab
     ;;
+amzn)
+    dnf update
+    dnf install -y openssh-server iproute passwd
+    # re-do this
+    ln -svf /etc/systemd/system/fcnet.service /etc/systemd/system/sysinit.target.wants/fcnet.service
+    rm -fv /etc/systemd/system/getty.target.wants/getty@tty1.service
+    ;;
 esac
+passwd -d root
 EOF
 }
 
@@ -70,3 +77,4 @@ make_rootfs ubuntu:22.04
 make_rootfs ubuntu:24.04
 make_rootfs ubuntu:24.10
 # make_rootfs ubuntu:latest
+make_rootfs amazonlinux:2023