diff --git a/.github/workflows/distinst-weekly.yml b/.github/workflows/distinst-weekly.yml
index 749e72d30..13d430eac 100644
--- a/.github/workflows/distinst-weekly.yml
+++ b/.github/workflows/distinst-weekly.yml
@@ -19,4 +19,4 @@ jobs:
 
     - name: Build and upload distinst .iso
       run: |
-        ./workflows.sh etc/terraform-daily-distinst-azure.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"
+        ./workflows.sh etc/terraform-daily-5.1-distinst-azure.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"
diff --git a/etc/config/package-lists.ubiquity/desktop.list.chroot_install b/etc/config/package-lists.default/desktop.list.chroot_install
similarity index 100%
rename from etc/config/package-lists.ubiquity/desktop.list.chroot_install
rename to etc/config/package-lists.default/desktop.list.chroot_install
diff --git a/etc/config/package-lists.ubiquity/desktop.list.chroot_live b/etc/config/package-lists.default/desktop.list.chroot_live
similarity index 100%
rename from etc/config/package-lists.ubiquity/desktop.list.chroot_live
rename to etc/config/package-lists.default/desktop.list.chroot_live
diff --git a/etc/config/package-lists.ubiquity/pool.list.binary b/etc/config/package-lists.default/pool.list.binary
similarity index 100%
rename from etc/config/package-lists.ubiquity/pool.list.binary
rename to etc/config/package-lists.default/pool.list.binary
diff --git a/etc/terraform-daily-5.1-azure.conf b/etc/terraform-daily-5.1-azure.conf
index e60ee7879..64c9b4dd1 100644
--- a/etc/terraform-daily-5.1-azure.conf
+++ b/etc/terraform-daily-5.1-azure.conf
@@ -32,4 +32,4 @@ INCLUDE_APPCENTER="yes"
 OUTPUT_SUFFIX=""
 
 # folder suffix for the package lists to use
-PACKAGE_LISTS_SUFFIX="ubiquity"
+PACKAGE_LISTS_SUFFIX="default"
diff --git a/etc/terraform-daily-distinst-azure.conf b/etc/terraform-daily-5.1-distinst-azure.conf
similarity index 100%
rename from etc/terraform-daily-distinst-azure.conf
rename to etc/terraform-daily-5.1-distinst-azure.conf
diff --git a/etc/terraform-daily-6.0-azure.conf b/etc/terraform-daily-6.0-azure.conf
index 20a8e4165..bc4093330 100644
--- a/etc/terraform-daily-6.0-azure.conf
+++ b/etc/terraform-daily-6.0-azure.conf
@@ -29,7 +29,7 @@ HWE=""
 INCLUDE_APPCENTER=""
 
 # suffix for generated .iso files
-OUTPUT_SUFFIX="-distinst"
+OUTPUT_SUFFIX=""
 
 # folder suffix for the package lists to use
-PACKAGE_LISTS_SUFFIX="distinst"
+PACKAGE_LISTS_SUFFIX="default"
diff --git a/etc/terraform-stable-azure.conf b/etc/terraform-stable-azure.conf
index 4af4331e1..61d2fc266 100644
--- a/etc/terraform-stable-azure.conf
+++ b/etc/terraform-stable-azure.conf
@@ -32,4 +32,4 @@ INCLUDE_APPCENTER="yes"
 OUTPUT_SUFFIX=""
 
 # folder suffix for the package lists to use
-PACKAGE_LISTS_SUFFIX="ubiquity"
+PACKAGE_LISTS_SUFFIX="default"