diff --git a/README.md b/README.md
index 3267ea2..0a87f96 100644
--- a/README.md
+++ b/README.md
@@ -101,10 +101,19 @@ will be commited.
 
 ### [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)
 
+- testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
+- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
+- testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
+- testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
+- testing:debian-13 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-13`
+- testing:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
+- testing:photon-4 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-4`
+- testing:photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-5`
 - testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
 - testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
 - testing:ubuntu-20.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-20.04`
 - testing:ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04`
+- testing:ubuntu-24.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-24.04`
 
 
 ### [![Virt Minion](https://github.com/saltstack/salt-ci-containers/actions/workflows/virt-minion-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/virt-minion-containers.yml)
diff --git a/containers.yml b/containers.yml
index 53cf0e0..faee557 100644
--- a/containers.yml
+++ b/containers.yml
@@ -48,8 +48,17 @@ custom:
     versions:
       - ubuntu-20.04
       - ubuntu-22.04
+      - ubuntu-24.04
       - rockylinux-8
       - rockylinux-9
+      - photon-4
+      - photon-5
+      - debian-11
+      - debian-12
+      - debian-13
+      - fedora-40
+      - amazonlinux-2
+      - amazonlinux-2023
 # <---- Custom Containers ---------------------------------------------------------------------------------
 
 # ----- Mirrored Containers ------------------------------------------------------------------------------>
diff --git a/custom/testing/01_nodoc b/custom/testing/01_nodoc
new file mode 100644
index 0000000..7320020
--- /dev/null
+++ b/custom/testing/01_nodoc
@@ -0,0 +1,9 @@
+path-exclude /usr/share/doc/*
+# we need to keep copyright files for legal reasons
+path-include /usr/share/doc/*/copyright
+path-exclude /usr/share/man/*
+path-exclude /usr/share/groff/*
+path-exclude /usr/share/info/*
+# lintian stuff is small, but really unnecessary
+path-exclude /usr/share/lintian/*
+path-exclude /usr/share/linda/*
diff --git a/custom/testing/README.md b/custom/testing/README.md
index b5c54ab..62e5cc0 100644
--- a/custom/testing/README.md
+++ b/custom/testing/README.md
@@ -1,6 +1,15 @@
 # [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)
 
+- testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
+- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
+- testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
+- testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
+- testing:debian-13 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-13`
+- testing:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
+- testing:photon-4 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-4`
+- testing:photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-5`
 - testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
 - testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
 - testing:ubuntu-20.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-20.04`
 - testing:ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04`
+- testing:ubuntu-24.04 - `ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-24.04`
diff --git a/custom/testing/amazonlinux-2.Dockerfile b/custom/testing/amazonlinux-2.Dockerfile
new file mode 100644
index 0000000..ab3b73b
--- /dev/null
+++ b/custom/testing/amazonlinux-2.Dockerfile
@@ -0,0 +1,7 @@
+FROM amazonlinux:2
+
+RUN yum update -y \
+  && yum install -y python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
+    systemd-units git gnupg2 jq createrepo rpm-sign epel-release rustc cargo \
+    curl wget \
+    && yum install -y patchelf
diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
new file mode 100644
index 0000000..6dd380c
--- /dev/null
+++ b/custom/testing/amazonlinux-2023.Dockerfile
@@ -0,0 +1,7 @@
+FROM amazonlinux:2023
+
+RUN yum update -y \
+  && yum install -y --allowerasing python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
+    systemd-units git gnupg2 jq createrepo rpm-sign rustc cargo \
+    curl wget \
+    && yum install -y patchelf
diff --git a/custom/testing/debian-11.Dockerfile b/custom/testing/debian-11.Dockerfile
new file mode 100644
index 0000000..a9bf8f0
--- /dev/null
+++ b/custom/testing/debian-11.Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:12
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && apt install -y apt-utils gnupg jq awscli python3 python3-venv python3-pip \
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc \
+    wget
diff --git a/custom/testing/debian-12.Dockerfile b/custom/testing/debian-12.Dockerfile
new file mode 100644
index 0000000..a9bf8f0
--- /dev/null
+++ b/custom/testing/debian-12.Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:12
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && apt install -y apt-utils gnupg jq awscli python3 python3-venv python3-pip \
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc \
+    wget
diff --git a/custom/testing/debian-13.Dockerfile b/custom/testing/debian-13.Dockerfile
new file mode 100644
index 0000000..30799af
--- /dev/null
+++ b/custom/testing/debian-13.Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:trixie
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && apt install -y apt-utils gnupg jq awscli python3 python3-venv python3-pip \
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc \
+    wget
diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
new file mode 100644
index 0000000..da82dc6
--- /dev/null
+++ b/custom/testing/fedora-40.Dockerfile
@@ -0,0 +1,6 @@
+FROM fedora:40
+
+RUN yum update -y \
+  && yum install -y --allowerasing python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
+    systemd-units libxcrypt-compat git gnupg2 jq createrepo rpm-sign rustc cargo \
+    curl wget patchelf
diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
new file mode 100644
index 0000000..501fe84
--- /dev/null
+++ b/custom/testing/photon-4.Dockerfile
@@ -0,0 +1,5 @@
+FROM photon:4.0
+
+RUN yum update -y \
+  && yum install -y --allowerasing python3 python3-devel python3-pip openssl git  \
+    git jq createrepo curl wget
diff --git a/custom/testing/photon-5.Dockerfile b/custom/testing/photon-5.Dockerfile
new file mode 100644
index 0000000..a8c0357
--- /dev/null
+++ b/custom/testing/photon-5.Dockerfile
@@ -0,0 +1,5 @@
+FROM photon:5.0
+
+RUN yum update -y \
+  && yum install -y --allowerasing python3 python3-devel python3-pip openssl git  \
+    git jq createrepo curl wget
diff --git a/custom/testing/rockylinux-8.Dockerfile b/custom/testing/rockylinux-8.Dockerfile
index 01fa494..0b221a7 100644
--- a/custom/testing/rockylinux-8.Dockerfile
+++ b/custom/testing/rockylinux-8.Dockerfile
@@ -2,5 +2,6 @@ FROM rockylinux:8
 
 RUN yum update -y \
   && yum install -y --allowerasing python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
-    systemd-units libxcrypt-compat git gnupg2 jq createrepo rpm-sign epel-release rustc cargo \
-  patchelf curl wget
+    systemd-units git gnupg2 jq createrepo rpm-sign epel-release rustc cargo \
+    curl wget \
+    && yum install -y patchelf
diff --git a/custom/testing/rockylinux-9.Dockerfile b/custom/testing/rockylinux-9.Dockerfile
index 28a69b4..ef6eb51 100644
--- a/custom/testing/rockylinux-9.Dockerfile
+++ b/custom/testing/rockylinux-9.Dockerfile
@@ -3,4 +3,5 @@ FROM rockylinux:9
 RUN yum update -y \
   && yum install -y --allowerasing python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
     systemd-units libxcrypt-compat git gnupg2 jq createrepo rpm-sign epel-release rustc cargo \
-  patchelf curl wget
+    curl wget \
+    && yum install -y patchelf
diff --git a/custom/testing/ubuntu-20.04.Dockerfile b/custom/testing/ubuntu-20.04.Dockerfile
index 2ed30d4..47f769a 100644
--- a/custom/testing/ubuntu-20.04.Dockerfile
+++ b/custom/testing/ubuntu-20.04.Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:20.04
 
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
 RUN apt update -y \
   && echo 'tzdata tzdata/Areas select America' | debconf-set-selections \
   && echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections \
diff --git a/custom/testing/ubuntu-22.04.Dockerfile b/custom/testing/ubuntu-22.04.Dockerfile
index 7824b85..6e2bbd0 100644
--- a/custom/testing/ubuntu-22.04.Dockerfile
+++ b/custom/testing/ubuntu-22.04.Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:22.04
 
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
 RUN apt update -y \
   && echo 'tzdata tzdata/Areas select America' | debconf-set-selections \
   && echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections \
diff --git a/custom/testing/ubuntu-24.04.Dockerfile b/custom/testing/ubuntu-24.04.Dockerfile
new file mode 100644
index 0000000..9c9af27
--- /dev/null
+++ b/custom/testing/ubuntu-24.04.Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:24.04
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && echo 'tzdata tzdata/Areas select America' | debconf-set-selections \
+  && echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections \
+  && DEBIAN_FRONTEND="noninteractive" apt install -y \
+    python3 python3-venv python3-pip unzip sudo tree \
+    wget