diff --git a/debian_trixie_pkg_dirs_std b/debian_trixie_pkg_dirs_std
new file mode 100644
index 000000000..2df302c78
--- /dev/null
+++ b/debian_trixie_pkg_dirs_std
@@ -0,0 +1,117 @@
+# base/base-passwd
+# base/cluster-resource-agents
+# base/dhcp
+# base/dnsmasq
+# base/haproxy
+# base/libfdt
+# base/lighttpd
+# base/linuxptp
+# base/lvm2
+# base/lsb
+# base/openssl
+# base/ca-certificates
+# base/pf-bb-config
+# base/synce4l
+# base/systemd
+# base/systemd-presets
+# base/watchdog
+# bmc/redfishtool
+# centos-debian-compat
+# ceph/ceph
+# config/facter
+# config/puppet-5.5.22
+# config/puppet-modules/openstack/puppet-ceph-2.4.1
+# config/puppet-modules/openstack/puppet-keystone-17.4.0
+# config/puppet-modules/openstack/puppet-horizon-17.4.0
+# config/puppet-modules/openstack/puppet-openstacklib-17.4.0
+# config/puppet-modules/openstack/puppet-oslo-17.4.0
+# config/puppet-modules/puppet-boolean-2.0.2
+# config/puppet-modules/puppet-dnsmasq
+# config/puppet-modules/puppet-drbd-0.5.2
+# config/puppet-modules/puppet-etcd-1.12.3
+# config/puppet-modules/puppetlabs-firewall-1.12.0
+# config/puppet-modules/puppetlabs-haproxy-2.1.0
+# config/puppet-modules/puppetlabs-mysql-8.1.0
+# config/puppet-modules/puppetlabs-postgresql-8.0.0
+# config/puppet-modules/puppetlabs-stdlib-5.0.0
+# config/puppet-modules/puppet-ldap
+# config/puppet-modules/puppet-hash2stuff
+# config/puppet-modules/puppet-lvm-1.4.0
+# config/puppet-modules/puppet-memcached
+# config/puppet-modules/puppet-network
+# config/puppet-modules/puppet-puppi
+# config/puppet-modules/puppet-rabbitmq-8.5.0
+# config/puppet-modules/puppet-staging
+# config/puppet-modules/puppet-zitrlp-strongswan
+# docker/python-docker
+# filesystem/drbd/drbd-tools
+# filesystem/luks
+# filesystem/parted
+# golang-github-dev/golang-github-appc-cni
+# golang-github-dev/golang-github-checkpoint-restore-go-criu-dev
+# golang-github-dev/golang-github-cilium-ebpf-dev
+# golang-github-dev/golang-github-coreos-go-systemd-dev
+# golang-github-dev/golang-github-opencontainers-specs-dev
+# golang-github-dev/golang-github-vishvananda-netlink
+# golang-github-dev/golang-github-networkplumbing-go-nft-dev
+# golang-github-dev/golang-github-cockroachdb-datadriven
+# golang-github-dev/golang-github-golang-jwt-jwt-dev
+# grub/grub-efi
+# grub/grub2
+# grub/grubby
+# kata-containers
+# kubernetes/chartmuseum
+# kubernetes/cni/bond-cni
+# kubernetes/cni/plugins
+# kubernetes/containerd
+# kubernetes/crictl
+# kubernetes/docker-distribution
+# kubernetes/etcd
+# kubernetes/flux2
+# kubernetes/flux2-charts
+# kubernetes/helm
+# kubernetes/k8s-cni-cache-cleanup
+# kubernetes/k8s-pod-recovery
+# kubernetes/kubernetes-1.24.4
+# kubernetes/kubernetes-1.25.3
+# kubernetes/kubernetes-1.26.1
+# kubernetes/kubernetes-1.27.5
+# kubernetes/kubernetes-1.28.4
+# kubernetes/kubernetes-1.29.2
+# kubernetes/kubernetes-1.30.6
+# kubernetes/kubernetes-1.31.5
+# kubernetes/kubernetes-unversioned
+# kubernetes/plugins/isolcpus-device-plugin
+# kubernetes/plugins/kubectl-cert-manager
+# kubernetes/runc
+# ldap/ldapscripts
+# ldap/openldap
+# networking/dpdk
+# networking/ifupdown
+# networking/ifupdown-extra
+# networking/ifenslave
+# networking/iputils
+# networking/lldpd
+# networking/net-tools
+# networking/openvswitch
+ostree/initramfs-ostree
+ostree/mttyexec
+ostree/ostree
+ostree/ostree-upgrade-mgr
+# python/dh-python
+# python/pynetlink
+# python/python-nss
+# python/python3-nsenter
+# python/python3-setuptools
+# python/python3-zmq
+# python/python3.9
+# python/zerorpc-python
+# security/efitools
+# security/keyrings.alt
+# security/python-keyring
+# security/shim-unsigned
+# security/openscap
+# storage-drivers/trident-installer
+# tools/kdump-tools
+# tools/crash
+# tools/makedumpfile
diff --git a/ostree/initramfs-ostree/debian/deb_patches/0001-Cleanup-package-depends-lists.patch b/ostree/initramfs-ostree/debian/all/deb_patches/0001-Cleanup-package-depends-lists.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/deb_patches/0001-Cleanup-package-depends-lists.patch
rename to ostree/initramfs-ostree/debian/all/deb_patches/0001-Cleanup-package-depends-lists.patch
diff --git a/ostree/initramfs-ostree/debian/deb_patches/0002-Update-Copyright-and-License.patch b/ostree/initramfs-ostree/debian/all/deb_patches/0002-Update-Copyright-and-License.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/deb_patches/0002-Update-Copyright-and-License.patch
rename to ostree/initramfs-ostree/debian/all/deb_patches/0002-Update-Copyright-and-License.patch
diff --git a/ostree/initramfs-ostree/debian/deb_patches/0003-Add-lvm2-package-to-initramfs.patch b/ostree/initramfs-ostree/debian/all/deb_patches/0003-Add-lvm2-package-to-initramfs.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/deb_patches/0003-Add-lvm2-package-to-initramfs.patch
rename to ostree/initramfs-ostree/debian/all/deb_patches/0003-Add-lvm2-package-to-initramfs.patch
diff --git a/ostree/initramfs-ostree/debian/deb_patches/series b/ostree/initramfs-ostree/debian/all/deb_patches/series
similarity index 100%
rename from ostree/initramfs-ostree/debian/deb_patches/series
rename to ostree/initramfs-ostree/debian/all/deb_patches/series
diff --git a/ostree/initramfs-ostree/debian/dl_hook b/ostree/initramfs-ostree/debian/all/dl_hook
similarity index 100%
rename from ostree/initramfs-ostree/debian/dl_hook
rename to ostree/initramfs-ostree/debian/all/dl_hook
diff --git a/ostree/initramfs-ostree/debian/meta_data.yaml b/ostree/initramfs-ostree/debian/all/meta_data.yaml
similarity index 100%
rename from ostree/initramfs-ostree/debian/meta_data.yaml
rename to ostree/initramfs-ostree/debian/all/meta_data.yaml
diff --git a/ostree/initramfs-ostree/debian/patches/0001-Prevent-auto-expansion-of-fluxdata-partition.patch b/ostree/initramfs-ostree/debian/all/patches/0001-Prevent-auto-expansion-of-fluxdata-partition.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0001-Prevent-auto-expansion-of-fluxdata-partition.patch
rename to ostree/initramfs-ostree/debian/all/patches/0001-Prevent-auto-expansion-of-fluxdata-partition.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0002-Make-boot-efi-mount-as-rw.patch b/ostree/initramfs-ostree/debian/all/patches/0002-Make-boot-efi-mount-as-rw.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0002-Make-boot-efi-mount-as-rw.patch
rename to ostree/initramfs-ostree/debian/all/patches/0002-Make-boot-efi-mount-as-rw.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0003-debian-set-default-size-variables-in-install-script.patch b/ostree/initramfs-ostree/debian/all/patches/0003-debian-set-default-size-variables-in-install-script.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0003-debian-set-default-size-variables-in-install-script.patch
rename to ostree/initramfs-ostree/debian/all/patches/0003-debian-set-default-size-variables-in-install-script.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0004-Wait-for-devices-to-be-configured-after-boot.patch b/ostree/initramfs-ostree/debian/all/patches/0004-Wait-for-devices-to-be-configured-after-boot.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0004-Wait-for-devices-to-be-configured-after-boot.patch
rename to ostree/initramfs-ostree/debian/all/patches/0004-Wait-for-devices-to-be-configured-after-boot.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0005-init-ostree-install.sh-break-hardlinks-in-var.patch b/ostree/initramfs-ostree/debian/all/patches/0005-init-ostree-install.sh-break-hardlinks-in-var.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0005-init-ostree-install.sh-break-hardlinks-in-var.patch
rename to ostree/initramfs-ostree/debian/all/patches/0005-init-ostree-install.sh-break-hardlinks-in-var.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0006-Add-support-for-StarlingX-partitioning-formatting.patch b/ostree/initramfs-ostree/debian/all/patches/0006-Add-support-for-StarlingX-partitioning-formatting.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0006-Add-support-for-StarlingX-partitioning-formatting.patch
rename to ostree/initramfs-ostree/debian/all/patches/0006-Add-support-for-StarlingX-partitioning-formatting.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0007-Make-driver-switch-more-adaptable.patch b/ostree/initramfs-ostree/debian/all/patches/0007-Make-driver-switch-more-adaptable.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0007-Make-driver-switch-more-adaptable.patch
rename to ostree/initramfs-ostree/debian/all/patches/0007-Make-driver-switch-more-adaptable.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0008-Allow-specifying-boot-root-devices-for-installs.patch b/ostree/initramfs-ostree/debian/all/patches/0008-Allow-specifying-boot-root-devices-for-installs.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0008-Allow-specifying-boot-root-devices-for-installs.patch
rename to ostree/initramfs-ostree/debian/all/patches/0008-Allow-specifying-boot-root-devices-for-installs.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0009-Allow-specifying-var-device-for-installs.patch b/ostree/initramfs-ostree/debian/all/patches/0009-Allow-specifying-var-device-for-installs.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0009-Allow-specifying-var-device-for-installs.patch
rename to ostree/initramfs-ostree/debian/all/patches/0009-Allow-specifying-var-device-for-installs.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0010-Add-Installer-and-Init-Multipath-support.patch b/ostree/initramfs-ostree/debian/all/patches/0010-Add-Installer-and-Init-Multipath-support.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0010-Add-Installer-and-Init-Multipath-support.patch
rename to ostree/initramfs-ostree/debian/all/patches/0010-Add-Installer-and-Init-Multipath-support.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0011-Add-H-W-Settle-time-to-installer-init.patch b/ostree/initramfs-ostree/debian/all/patches/0011-Add-H-W-Settle-time-to-installer-init.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0011-Add-H-W-Settle-time-to-installer-init.patch
rename to ostree/initramfs-ostree/debian/all/patches/0011-Add-H-W-Settle-time-to-installer-init.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0012-installer-inc-number-of-digits-in-scripts-names.patch b/ostree/initramfs-ostree/debian/all/patches/0012-installer-inc-number-of-digits-in-scripts-names.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0012-installer-inc-number-of-digits-in-scripts-names.patch
rename to ostree/initramfs-ostree/debian/all/patches/0012-installer-inc-number-of-digits-in-scripts-names.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0013-Rsync-the-ostree-repo-before-pulling.patch b/ostree/initramfs-ostree/debian/all/patches/0013-Rsync-the-ostree-repo-before-pulling.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0013-Rsync-the-ostree-repo-before-pulling.patch
rename to ostree/initramfs-ostree/debian/all/patches/0013-Rsync-the-ostree-repo-before-pulling.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0014-init-ostree-install.sh-support-boot-option-inst.ks-f.patch b/ostree/initramfs-ostree/debian/all/patches/0014-init-ostree-install.sh-support-boot-option-inst.ks-f.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0014-init-ostree-install.sh-support-boot-option-inst.ks-f.patch
rename to ostree/initramfs-ostree/debian/all/patches/0014-init-ostree-install.sh-support-boot-option-inst.ks-f.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0015-Support-driver-switch-in-installer.patch b/ostree/initramfs-ostree/debian/all/patches/0015-Support-driver-switch-in-installer.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0015-Support-driver-switch-in-installer.patch
rename to ostree/initramfs-ostree/debian/all/patches/0015-Support-driver-switch-in-installer.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0016-init-ostree-install.sh-skip-eject-operation-through-.patch b/ostree/initramfs-ostree/debian/all/patches/0016-init-ostree-install.sh-skip-eject-operation-through-.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0016-init-ostree-install.sh-skip-eject-operation-through-.patch
rename to ostree/initramfs-ostree/debian/all/patches/0016-init-ostree-install.sh-skip-eject-operation-through-.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0017-Allow-adjusting-boot-order.patch b/ostree/initramfs-ostree/debian/all/patches/0017-Allow-adjusting-boot-order.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0017-Allow-adjusting-boot-order.patch
rename to ostree/initramfs-ostree/debian/all/patches/0017-Allow-adjusting-boot-order.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0018-Support-OOT-and-In-tree-drivers-switch.patch b/ostree/initramfs-ostree/debian/all/patches/0018-Support-OOT-and-In-tree-drivers-switch.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0018-Support-OOT-and-In-tree-drivers-switch.patch
rename to ostree/initramfs-ostree/debian/all/patches/0018-Support-OOT-and-In-tree-drivers-switch.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0019-Support-the-single-driver-switch.patch b/ostree/initramfs-ostree/debian/all/patches/0019-Support-the-single-driver-switch.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0019-Support-the-single-driver-switch.patch
rename to ostree/initramfs-ostree/debian/all/patches/0019-Support-the-single-driver-switch.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0020-Make-sure-the-default-driver-is-the-in-tree-driver.patch b/ostree/initramfs-ostree/debian/all/patches/0020-Make-sure-the-default-driver-is-the-in-tree-driver.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0020-Make-sure-the-default-driver-is-the-in-tree-driver.patch
rename to ostree/initramfs-ostree/debian/all/patches/0020-Make-sure-the-default-driver-is-the-in-tree-driver.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0021-install-Make-sure-the-default-driver-is-the-in-tree-.patch b/ostree/initramfs-ostree/debian/all/patches/0021-install-Make-sure-the-default-driver-is-the-in-tree-.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0021-install-Make-sure-the-default-driver-is-the-in-tree-.patch
rename to ostree/initramfs-ostree/debian/all/patches/0021-install-Make-sure-the-default-driver-is-the-in-tree-.patch
diff --git a/ostree/initramfs-ostree/debian/patches/0022-Add-partition-support-for-finding-embedded-partition.patch b/ostree/initramfs-ostree/debian/all/patches/0022-Add-partition-support-for-finding-embedded-partition.patch
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/0022-Add-partition-support-for-finding-embedded-partition.patch
rename to ostree/initramfs-ostree/debian/all/patches/0022-Add-partition-support-for-finding-embedded-partition.patch
diff --git a/ostree/initramfs-ostree/debian/patches/series b/ostree/initramfs-ostree/debian/all/patches/series
similarity index 100%
rename from ostree/initramfs-ostree/debian/patches/series
rename to ostree/initramfs-ostree/debian/all/patches/series
diff --git a/ostree/mttyexec/debian/deb_patches/0001-Cleanup-package-depends-lists.patch b/ostree/mttyexec/debian/all/deb_patches/0001-Cleanup-package-depends-lists.patch
similarity index 100%
rename from ostree/mttyexec/debian/deb_patches/0001-Cleanup-package-depends-lists.patch
rename to ostree/mttyexec/debian/all/deb_patches/0001-Cleanup-package-depends-lists.patch
diff --git a/ostree/mttyexec/debian/deb_patches/0002-Update-Copyright-and-License.patch b/ostree/mttyexec/debian/all/deb_patches/0002-Update-Copyright-and-License.patch
similarity index 100%
rename from ostree/mttyexec/debian/deb_patches/0002-Update-Copyright-and-License.patch
rename to ostree/mttyexec/debian/all/deb_patches/0002-Update-Copyright-and-License.patch
diff --git a/ostree/mttyexec/debian/deb_patches/series b/ostree/mttyexec/debian/all/deb_patches/series
similarity index 100%
rename from ostree/mttyexec/debian/deb_patches/series
rename to ostree/mttyexec/debian/all/deb_patches/series
diff --git a/ostree/mttyexec/debian/dl_hook b/ostree/mttyexec/debian/all/dl_hook
similarity index 100%
rename from ostree/mttyexec/debian/dl_hook
rename to ostree/mttyexec/debian/all/dl_hook
diff --git a/ostree/mttyexec/debian/meta_data.yaml b/ostree/mttyexec/debian/all/meta_data.yaml
similarity index 100%
rename from ostree/mttyexec/debian/meta_data.yaml
rename to ostree/mttyexec/debian/all/meta_data.yaml
diff --git a/ostree/ostree-upgrade-mgr/debian/deb_patches/0001-Cleanup-package-depends-lists.patch b/ostree/ostree-upgrade-mgr/debian/all/deb_patches/0001-Cleanup-package-depends-lists.patch
similarity index 100%
rename from ostree/ostree-upgrade-mgr/debian/deb_patches/0001-Cleanup-package-depends-lists.patch
rename to ostree/ostree-upgrade-mgr/debian/all/deb_patches/0001-Cleanup-package-depends-lists.patch
diff --git a/ostree/ostree-upgrade-mgr/debian/deb_patches/0002-Update-Copyright-and-License.patch b/ostree/ostree-upgrade-mgr/debian/all/deb_patches/0002-Update-Copyright-and-License.patch
similarity index 100%
rename from ostree/ostree-upgrade-mgr/debian/deb_patches/0002-Update-Copyright-and-License.patch
rename to ostree/ostree-upgrade-mgr/debian/all/deb_patches/0002-Update-Copyright-and-License.patch
diff --git a/ostree/ostree-upgrade-mgr/debian/deb_patches/series b/ostree/ostree-upgrade-mgr/debian/all/deb_patches/series
similarity index 100%
rename from ostree/ostree-upgrade-mgr/debian/deb_patches/series
rename to ostree/ostree-upgrade-mgr/debian/all/deb_patches/series
diff --git a/ostree/ostree-upgrade-mgr/debian/dl_hook b/ostree/ostree-upgrade-mgr/debian/all/dl_hook
similarity index 100%
rename from ostree/ostree-upgrade-mgr/debian/dl_hook
rename to ostree/ostree-upgrade-mgr/debian/all/dl_hook
diff --git a/ostree/ostree-upgrade-mgr/debian/meta_data.yaml b/ostree/ostree-upgrade-mgr/debian/all/meta_data.yaml
similarity index 100%
rename from ostree/ostree-upgrade-mgr/debian/meta_data.yaml
rename to ostree/ostree-upgrade-mgr/debian/all/meta_data.yaml
diff --git a/ostree/ostree/debian/dl_hook b/ostree/ostree/debian/all/dl_hook
similarity index 100%
rename from ostree/ostree/debian/dl_hook
rename to ostree/ostree/debian/all/dl_hook
diff --git a/ostree/ostree/debian/meta_data.yaml b/ostree/ostree/debian/all/meta_data.yaml
similarity index 100%
rename from ostree/ostree/debian/meta_data.yaml
rename to ostree/ostree/debian/all/meta_data.yaml