diff --git a/custom/testing/debian-11.Dockerfile b/custom/testing/debian-11.Dockerfile
index a9bf8f0..28dad8f 100644
--- a/custom/testing/debian-11.Dockerfile
+++ b/custom/testing/debian-11.Dockerfile
@@ -1,8 +1,27 @@
-FROM debian:12
+FROM debian:11
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
 
-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
+RUN <<EOF
+echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+export DEBIAN_FRONTEND="noninteractive"
+if [ $(uname -m) = "x86_64" ]; then
+  export ARCH=x86_64
+else
+  export ARCH=arm64
+fi
+apt update -y
+apt install -y tar wget xz-utils vim-nox apt-utils
+wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+rm -rf salt
+rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+rm -rf golden-pillar-tree
+rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/debian-12.Dockerfile b/custom/testing/debian-12.Dockerfile
index a9bf8f0..5ec6b3b 100644
--- a/custom/testing/debian-12.Dockerfile
+++ b/custom/testing/debian-12.Dockerfile
@@ -1,8 +1,27 @@
 FROM debian:12
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
 
-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
+RUN <<EOF
+echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+export DEBIAN_FRONTEND="noninteractive"
+if [ $(uname -m) = "x86_64" ]; then
+  export ARCH=x86_64
+else
+  export ARCH=arm64
+fi
+apt update -y
+apt install -y tar wget xz-utils vim-nox apt-utils
+wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+rm -rf salt
+rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+rm -rf golden-pillar-tree
+rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/debian-13.Dockerfile b/custom/testing/debian-13.Dockerfile
index 30799af..5414fb5 100644
--- a/custom/testing/debian-13.Dockerfile
+++ b/custom/testing/debian-13.Dockerfile
@@ -2,7 +2,27 @@ 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
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+RUN <<EOF
+echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+export DEBIAN_FRONTEND="noninteractive"
+if [ $(uname -m) = "x86_64" ]; then
+  export ARCH=x86_64
+else
+  export ARCH=arm64
+fi
+apt update -y
+apt install -y tar wget xz-utils vim-nox apt-utils
+wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+rm -rf salt
+rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+rm -rf golden-pillar-tree
+rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
index da82dc6..7c1bf0b 100644
--- a/custom/testing/fedora-40.Dockerfile
+++ b/custom/testing/fedora-40.Dockerfile
@@ -1,6 +1,24 @@
 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
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+RUN <<EOF
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+  yum update -y
+  yum install -y epel-release
+  yum install -y curl wget tar xz patchelf
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/rockylinux-8.Dockerfile b/custom/testing/rockylinux-8.Dockerfile
index 0b221a7..ce0a4e4 100644
--- a/custom/testing/rockylinux-8.Dockerfile
+++ b/custom/testing/rockylinux-8.Dockerfile
@@ -1,7 +1,24 @@
 FROM rockylinux:8
 
-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 epel-release rustc cargo \
-    curl wget \
-    && yum install -y patchelf
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+RUN <<EOF
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+  yum update -y
+  yum install -y epel-release
+  yum install -y curl wget tar xz patchelf
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/rockylinux-9.Dockerfile b/custom/testing/rockylinux-9.Dockerfile
index ef6eb51..9a0c32a 100644
--- a/custom/testing/rockylinux-9.Dockerfile
+++ b/custom/testing/rockylinux-9.Dockerfile
@@ -1,7 +1,24 @@
 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 \
-    curl wget \
-    && yum install -y patchelf
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+RUN <<EOF
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+  yum update -y
+  yum install -y epel-release
+  yum install -y curl wget tar xz patchelf
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
index 7abef07..d3b3b9c 100644
--- a/custom/testing/systemd-ubuntu-22.04.Dockerfile
+++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -12,7 +12,7 @@ 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 \
-  tree tar wget xz-utils apt-utils systemd
+  tree tar wget xz-utils apt-utils systemd python3 python3-pip git
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 COPY entrypoint.py entrypoint.py
diff --git a/custom/testing/ubuntu-20.04.Dockerfile b/custom/testing/ubuntu-20.04.Dockerfile
index 85e4347..0beadae 100644
--- a/custom/testing/ubuntu-20.04.Dockerfile
+++ b/custom/testing/ubuntu-20.04.Dockerfile
@@ -1,10 +1,27 @@
 FROM ubuntu:20.04
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
 
-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 systemctl
+RUN <<EOF
+echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+export DEBIAN_FRONTEND="noninteractive"
+if [ $(uname -m) = "x86_64" ]; then
+  export ARCH=x86_64
+else
+  export ARCH=arm64
+fi
+apt update -y
+apt install -y tar wget xz-utils vim-nox apt-utils
+wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+rm -rf salt
+rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+rm -rf golden-pillar-tree
+rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]
diff --git a/custom/testing/ubuntu-22.04.Dockerfile b/custom/testing/ubuntu-22.04.Dockerfile
index 6313791..91e82b1 100644
--- a/custom/testing/ubuntu-22.04.Dockerfile
+++ b/custom/testing/ubuntu-22.04.Dockerfile
@@ -17,7 +17,7 @@ fi
 apt update -y
 apt install -y tar wget xz-utils vim-nox apt-utils
 wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
-tar xvf salt-3007.1-onedir-linux-$ARCH.tar.xz
+tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
 ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
 rm -rf salt
 rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
diff --git a/custom/testing/ubuntu-24.04.Dockerfile b/custom/testing/ubuntu-24.04.Dockerfile
index ef109af..e30786e 100644
--- a/custom/testing/ubuntu-24.04.Dockerfile
+++ b/custom/testing/ubuntu-24.04.Dockerfile
@@ -1,10 +1,27 @@
 FROM ubuntu:24.04
 
 COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
 
-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 systemctl
+RUN <<EOF
+echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+export DEBIAN_FRONTEND="noninteractive"
+if [ $(uname -m) = "x86_64" ]; then
+  export ARCH=x86_64
+else
+  export ARCH=arm64
+fi
+apt update -y
+apt install -y tar wget xz-utils vim-nox apt-utils
+wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+rm -rf salt
+rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+rm -rf golden-pillar-tree
+rm -rf golden-state-tree
+EOF
+
+CMD ["/bin/bash"]