diff --git a/debian_iso_image.inc b/debian_bullseye_iso_image_std.inc
similarity index 100%
rename from debian_iso_image.inc
rename to debian_bullseye_iso_image_std.inc
diff --git a/debian_pkg_dirs b/debian_bullseye_pkg_dirs_std
similarity index 100%
rename from debian_pkg_dirs
rename to debian_bullseye_pkg_dirs_std
diff --git a/debian_trixie_iso_image_std.inc b/debian_trixie_iso_image_std.inc
new file mode 100644
index 00000000..cbda5493
--- /dev/null
+++ b/debian_trixie_iso_image_std.inc
@@ -0,0 +1,4 @@
+# List of packages to be included/installed in ISO
+
+#distributedcloud-client
+distributedcloud-client-dcmanagerclient
diff --git a/debian_trixie_pkg_dirs_std b/debian_trixie_pkg_dirs_std
new file mode 100644
index 00000000..b6de7442
--- /dev/null
+++ b/debian_trixie_pkg_dirs_std
@@ -0,0 +1 @@
+distributedcloud-client
diff --git a/distributedcloud-client/debian/deb_folder/changelog b/distributedcloud-client/debian/all/deb_folder/changelog
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/changelog
rename to distributedcloud-client/debian/all/deb_folder/changelog
diff --git a/distributedcloud-client/debian/deb_folder/control b/distributedcloud-client/debian/all/deb_folder/control
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/control
rename to distributedcloud-client/debian/all/deb_folder/control
diff --git a/distributedcloud-client/debian/deb_folder/copyright b/distributedcloud-client/debian/all/deb_folder/copyright
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/copyright
rename to distributedcloud-client/debian/all/deb_folder/copyright
diff --git a/distributedcloud-client/debian/deb_folder/distributedcloud-client-dcmanagerclient.install b/distributedcloud-client/debian/all/deb_folder/distributedcloud-client-dcmanagerclient.install
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/distributedcloud-client-dcmanagerclient.install
rename to distributedcloud-client/debian/all/deb_folder/distributedcloud-client-dcmanagerclient.install
diff --git a/distributedcloud-client/debian/deb_folder/distributedcloud-client-wheels.install b/distributedcloud-client/debian/all/deb_folder/distributedcloud-client-wheels.install
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/distributedcloud-client-wheels.install
rename to distributedcloud-client/debian/all/deb_folder/distributedcloud-client-wheels.install
diff --git a/distributedcloud-client/debian/deb_folder/rules b/distributedcloud-client/debian/all/deb_folder/rules
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/rules
rename to distributedcloud-client/debian/all/deb_folder/rules
diff --git a/distributedcloud-client/debian/deb_folder/source/format b/distributedcloud-client/debian/all/deb_folder/source/format
similarity index 100%
rename from distributedcloud-client/debian/deb_folder/source/format
rename to distributedcloud-client/debian/all/deb_folder/source/format
diff --git a/distributedcloud-client/debian/meta_data.yaml b/distributedcloud-client/debian/all/meta_data.yaml
similarity index 100%
rename from distributedcloud-client/debian/meta_data.yaml
rename to distributedcloud-client/debian/all/meta_data.yaml