4 files changed, 11 insertions, 4 deletions
diff --git a/molecule/default/Dockerfile.archlinux.j2 b/molecule/default/Dockerfile.archlinux.j2
index 9b2cbd8..177724d 100644
--- a/molecule/default/Dockerfile.archlinux.j2
+++ b/molecule/default/Dockerfile.archlinux.j2
@@ -17,4 +17,4 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; \
 
 VOLUME ["/sys/fs/cgroup"]
 
-CMD ["/usr/sbin/init"]
+CMD ["/lib/systemd/systemd"]
diff --git a/molecule/default/Dockerfile.debian.j2 b/molecule/default/Dockerfile.raspberrypi.j2
index c28918e..33475b7 100644
--- a/molecule/default/Dockerfile.debian.j2
+++ b/molecule/default/Dockerfile.raspberrypi.j2
@@ -8,7 +8,7 @@ ENV container docker
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        systemd systemd-sysv python3 parted dosfstools \
+        systemd python3 parted dosfstools \
     && rm -Rf /var/lib/apt/lists/* \
     && rm -Rf /usr/share/doc \
     && rm -Rf /usr/share/man \
@@ -16,6 +16,12 @@ RUN apt-get update \
 
 RUN rm -f /lib/systemd/system/multi-user.target.wants/getty.target
 
+# Mimic the Raspberry OS Bookworm default boot (for testing)
+RUN mkdir -p /boot/firmware \
+    && touch /boot/firmware/kernel8.img \
+    && touch /boot/firmware/bootcode.bin \
+    && touch /boot/firmware/start.elf
+
 VOLUME ["/sys/fs/cgroup", "/tmp", "/run", "/opt"]
 
 CMD ["/lib/systemd/systemd"]
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index a5b30f5..c9f5f8d 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -10,9 +10,10 @@ platforms:
   - name: instance
     image: ${MOLECULE_DISTRO:-archlinux}
     dockerfile: Dockerfile.${MOLECULE_DISTRO:-archlinux}.j2
+    platform: "${MOLECULE_PLATFORM:-linux/amd64}"
     pre_build_image: false
     privileged: true
-    command: ${MOLECULE_COMMAND:-""}
+    command: "${MOLECULE_COMMAND:-/lib/systemd/systemd}"
     tmpfs:
       - "/tmp"
       - "/run"
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index 885103f..bd37f5f 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -8,7 +8,7 @@
         distro_hostname_mapping:
           archlinux: "archlinux.local"
           ubuntu: "ubuntu.local"
-          debian: "rpi5.local"
+          raspberrypi: "rpi5.local"
 
     - name: "Create virtual disk image"
       become: true