diff --git a/README.md b/README.md
index cf8d088..0ebab24 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,6 @@ will be commited.
 - testing:altlinux-11 - `ghcr.io/saltstack/salt-ci-containers/testing:altlinux-11`
 - 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-42 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-42`
diff --git a/containers.yml b/containers.yml
index cef93d4..8148293 100644
--- a/containers.yml
+++ b/containers.yml
@@ -52,7 +52,6 @@ custom:
       - rockylinux-10
       - photon-4
       - photon-5
-      - debian-11
       - debian-12
       - debian-13
       - fedora-42
diff --git a/custom/testing/README.md b/custom/testing/README.md
index 351d648..844b789 100644
--- a/custom/testing/README.md
+++ b/custom/testing/README.md
@@ -4,7 +4,6 @@
 - testing:altlinux-11 - `ghcr.io/saltstack/salt-ci-containers/testing:altlinux-11`
 - 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-42 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-42`
diff --git a/custom/testing/debian-11.Dockerfile b/custom/testing/debian-11.Dockerfile
deleted file mode 100644
index 2ce6922..0000000
--- a/custom/testing/debian-11.Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-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
-
-SHELL ["/bin/bash", "-c"]
-
-RUN <<EOF
-  set -e
-
-  if [ $(uname -m) = "x86_64" ]; then
-    export ARCH=x86_64
-  else
-    export ARCH=arm64
-  fi
-  export SALT_VERSION=3007.13
-
-  echo 'tzdata tzdata/Areas select America' | debconf-set-selections
-  echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-
-  export DEBIAN_FRONTEND="noninteractive"
-
-  # QEMU arm64: ldconfig (libc-bin post-install) segfaults under emulation on
-  # Debian 11's glibc 2.31. Replace with a no-op for the duration of the build.
-  if [ "$ARCH" = "arm64" ]; then
-    mv /sbin/ldconfig /sbin/ldconfig.real
-    cp /bin/true /sbin/ldconfig
-  fi
-
-  apt update -y
-  apt install -y tar wget xz-utils vim-nox apt-utils
-
-  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/$SALT_VERSION/salt-$SALT_VERSION-onedir-linux-$ARCH.tar.xz
-  tar xf salt-$SALT_VERSION-onedir-linux-$ARCH.tar.xz
-
-  # Ensure Salt can find its bundled libcrypto on ARM64. This is a workaround for a Salt bug where
-  # rsax931.py ignores bundled libraries on Linux. We use a sed patch to avoid lookup failures.
-  # This should go away after we have a proper fix in salt/utils/rsax931.py
-  sed -i 's/lib = ctypes.util.find_library("crypto")/lib = (glob.glob(os.path.join(os.path.dirname(os.path.dirname(sys.executable)), "lib", "libcrypto.so*")) + [ctypes.util.find_library("crypto")])[0]/' ./salt/lib/python3.10/site-packages/salt/utils/rsax931.py
-
-  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
-
-  rm -rf salt
-  rm -rf salt-$SALT_VERSION-onedir-linux-$ARCH.tar.xz
-  rm -rf golden-pillar-tree
-  rm -rf golden-state-tree
-
-  # Restore ldconfig and rebuild the library cache. ldconfig itself can
-  # segfault intermittently under QEMU arm64 emulation, so retry a few
-  # times before giving up.
-  if [ "$ARCH" = "arm64" ]; then
-    mv /sbin/ldconfig.real /sbin/ldconfig
-    for i in 1 2 3 4 5; do
-      /sbin/ldconfig && break
-      echo "ldconfig attempt $i failed, retrying..."
-      sleep 1
-    done
-  fi
-
-  rm -rf /var/log/salt
-  rm -rf /var/cache/salt
-  rm -rf /etc/salt
-  rm -rf /tmp/*
-  ln -s /bin/systemd /usr/lib/systemd/systemd
-  apt-get clean
-  rm -rf /var/cache/apt/archives/*
-EOF
-
-CMD ["/bin/bash"]
diff --git a/custom/testing/golden-state-tree/os/debian/pkgs/init.sls b/custom/testing/golden-state-tree/os/debian/pkgs/init.sls
index c5a4cdd..df02268 100644
--- a/custom/testing/golden-state-tree/os/debian/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/debian/pkgs/init.sls
@@ -7,9 +7,7 @@ include:
   {%- elif grains['osrelease'] != '13' %}
   - pkgs.dnsutils
   {%- endif %}
-  {%- if grains['osrelease'] == '11' %}
   - pkgs.docker
-  {%- endif %}
   - pkgs.file
   - pkgs.gcc
   - pkgs.gpg
@@ -40,8 +38,7 @@ include:
   - pkgs.swig
   - pkgs.tar
   - pkgs.zlib
-  {#- HashiCorp no longer publishes a Release file for bullseye (11), same as trixie (13) #}
-  {%- if grains['osrelease'] not in ('11', '13') and grains['osarch'] != 'arm64' %}
+  {%- if grains['osarch'] != 'arm64' %}
   - pkgs.vault
   {%- endif %}
   - pkgs.jq
diff --git a/custom/testing/golden-state-tree/pkgs/docker.sls b/custom/testing/golden-state-tree/pkgs/docker.sls
index 76b8327..75f0a2e 100644
--- a/custom/testing/golden-state-tree/pkgs/docker.sls
+++ b/custom/testing/golden-state-tree/pkgs/docker.sls
@@ -7,7 +7,8 @@
 {%- endif %}
 
 {%- if grains['os'] == 'Debian' %}
-  {% set pkgver = '=5:28.4.0-1~debian.11~bullseye' %}
+  {%- set debian_codenames = {'11': 'bullseye', '12': 'bookworm', '13': 'trixie'} %}
+  {% set pkgver = '=5:28.4.0-1~debian.' + grains['osrelease'] + '~' + debian_codenames[grains['osrelease']] %}
 {%- else %}
   {% set pkgver = '' %}
 {%- endif %}