diff --git a/container/debian/control b/container/debian/control
index f086d4d78c0..49daa635419 100644
--- a/container/debian/control
+++ b/container/debian/control
@@ -16,7 +16,9 @@ Depends: acl,
          crun,
          libnss3-tools,
          mkcert,
+         passt,
          podman (>= 4.4),
+         uidmap,
          yq,
 Pre-Depends: ${misc:Pre-Depends}
 Description: Cuttlefish Android Virtual Device companion package
diff --git a/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.init b/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.init
index 5d1c5f699a7..c734d5aff13 100644
--- a/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.init
+++ b/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.init
@@ -57,8 +57,8 @@ start() {
     echo 1 > /proc/sys/net/ipv4/ip_forward
     echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
 
-    modprobe vhost_net || true
-    modprobe vhost_vsock || true
+    [ -c /dev/vhost-net ] && [ -e /sys/class/misc/vhost-net ] || modprobe vhost_net
+    [ -c /dev/vhost-vsock ] && [ -e /sys/class/misc/vhost-vsock ] || modprobe vhost_vsock
 
     ip link add "${podcvd_ifname}" type dummy
     ip link set "${podcvd_ifname}" up
diff --git a/container/debian/podcvd-setup b/container/debian/podcvd-setup
index 03d246d6516..601082b32f2 100755
--- a/container/debian/podcvd-setup
+++ b/container/debian/podcvd-setup
@@ -112,8 +112,8 @@ KERNEL=="vhost-vsock", RUN+="/usr/bin/setfacl -m u:$username:rw /dev/%k"
 EOF
 
     # Ensure vhost_net and vhost_vsock exists
-    modprobe vhost_net
-    modprobe vhost_vsock
+    [ -c /dev/vhost-net ] && [ -e /sys/class/misc/vhost-net ] || modprobe vhost_net
+    [ -c /dev/vhost-vsock ] && [ -e /sys/class/misc/vhost-vsock ] || modprobe vhost_vsock
 
     udevadm control --reload-rules
     udevadm trigger --action=change /dev/kvm