diff --git a/tests/image_prep/group_vars/all.yml b/tests/image_prep/group_vars/all.yml
index 9316a3d9..b3211ad6 100644
--- a/tests/image_prep/group_vars/all.yml
+++ b/tests/image_prep/group_vars/all.yml
@@ -15,3 +15,4 @@ sudo_group:
   Debian: sudo
   Ubuntu: sudo
   CentOS: wheel
+  AlmaLinux: wheel
diff --git a/tests/image_prep/host_vars/alma9.yml b/tests/image_prep/host_vars/alma9.yml
new file mode 100644
index 00000000..63279e0c
--- /dev/null
+++ b/tests/image_prep/host_vars/alma9.yml
@@ -0,0 +1,5 @@
+bootstrap_packages: [python3]
+docker_base: almalinux:9
+
+packages:
+  - perl-JSON
diff --git a/tests/image_prep/host_vars/debian12.yml b/tests/image_prep/host_vars/debian12.yml
new file mode 100644
index 00000000..7bcdf94f
--- /dev/null
+++ b/tests/image_prep/host_vars/debian12.yml
@@ -0,0 +1,8 @@
+bootstrap_packages: [python, python3-apt]
+docker_base: debian:12
+
+packages:
+  - libjson-perl
+  - locales
+  - opendoas
+  - virtualenv
diff --git a/tests/image_prep/host_vars/ubuntu2204.yml b/tests/image_prep/host_vars/ubuntu2204.yml
new file mode 100644
index 00000000..3d20e507
--- /dev/null
+++ b/tests/image_prep/host_vars/ubuntu2204.yml
@@ -0,0 +1,10 @@
+bootstrap_packages: [python3]
+docker_base: ubuntu:22.04
+
+packages:
+  - doas
+  - libjson-perl
+  - locales
+  - python2
+  - python3-virtualenv
+  - virtualenv
diff --git a/tests/image_prep/host_vars/ubuntu2404.yml b/tests/image_prep/host_vars/ubuntu2404.yml
new file mode 100644
index 00000000..cc9a1efb
--- /dev/null
+++ b/tests/image_prep/host_vars/ubuntu2404.yml
@@ -0,0 +1,9 @@
+bootstrap_packages: [python3]
+docker_base: ubuntu:24.04
+
+packages:
+  - libjson-perl
+  - locales
+  - opendoas
+  - python3-virtualenv
+  - virtualenv
diff --git a/tests/image_prep/hosts.ini b/tests/image_prep/hosts.ini
index a6d6b6b0..254643a7 100644
--- a/tests/image_prep/hosts.ini
+++ b/tests/image_prep/hosts.ini
@@ -1,4 +1,5 @@
 [all:children]
+alma
 centos
 debian
 ubuntu
@@ -6,6 +7,9 @@ ubuntu
 [all:vars]
 ansible_connection = docker
 
+[alma]
+alma9
+
 [centos]
 centos5
 centos6
@@ -16,11 +20,14 @@ centos8
 debian9
 debian10
 debian11
+debian12
 
 [ubuntu]
 ubuntu1604
 ubuntu1804
 ubuntu2004
+ubuntu2204
+ubuntu2404
 
 [ansible_2_3]
 # Python 2.4 on targets
@@ -40,4 +47,9 @@ ubuntu1804
 
 [ansible_11]
 # Python >= 3.8 on targets
+alma9
 debian11
+debian12
+ubuntu2004
+ubuntu2204
+ubuntu2404