From ff69cb898e4e87a2d499df1cf4f1e7128c856f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 09:46:36 -0800
Subject: [PATCH 1/9] Add mkosi.conf

Rename conf
---
 etc/mkosi-daily-8.1-azure-amd64.conf | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 etc/mkosi-daily-8.1-azure-amd64.conf

diff --git a/etc/mkosi-daily-8.1-azure-amd64.conf b/etc/mkosi-daily-8.1-azure-amd64.conf
new file mode 100644
index 00000000..aec3c73b
--- /dev/null
+++ b/etc/mkosi-daily-8.1-azure-amd64.conf
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2026 elementary, Inc. (https://elementary.io)
+
+[Distribution]
+Architecture=x86-64
+Distribution=ubuntu
+Release=noble
+Mirror=http://azure.archive.ubuntu.com/ubuntu/
+Repositories=main restricted universe multiverse
+
+[Output]
+Format=disk
+Output=elementaryos-8.1-daily-amd64
+OutputDirectory=builds/amd64
+#ImageVersion=
+
+[Content]
+Packages=
+    linux-image-generic
+    systemd-boot
+    # elementary-desktop
+    # elementary-minimal
+    # elementary-standard
+Bootable=yes
+Bootloader=grub-signed
+BiosBootloader=grub
+ShimBootloader=signed
+#Checksum=

From 70ce4cd959dc9318fd52f28e0111fa433a36913e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 10:35:41 -0800
Subject: [PATCH 2/9] Skip workflows

Skip arm
---
 .github/workflows/daily-8.1.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/daily-8.1.yml b/.github/workflows/daily-8.1.yml
index e5db2b88..c0ee3b82 100644
--- a/.github/workflows/daily-8.1.yml
+++ b/.github/workflows/daily-8.1.yml
@@ -16,8 +16,8 @@ jobs:
         include:
           - runner: ubuntu-24.04
             arch: amd64
-          - runner: ubuntu-24.04-arm
-            arch: arm64
+          # - runner: ubuntu-24.04-arm
+          #   arch: arm64
     runs-on: ${{ matrix.runner }}
 
     container:
@@ -32,4 +32,4 @@ jobs:
 
     - name: Build and upload daily .iso
       run: |
-        ./workflows.sh etc/terraform-daily-8.1-azure-${{ matrix.arch }}.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"
+        ./build.sh etc/terraform-daily-8.1-azure-${{ matrix.arch }}.conf

From 84fc94c947b416b5193786714d935760943fc1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 10:40:32 -0800
Subject: [PATCH 3/9] Replace live-build

Rename some more stuff

Remove failing symlink line
---
 build.sh | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/build.sh b/build.sh
index 2c1c41a0..aad0d1e3 100755
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,7 @@ fi
 if [ -n "$1" ]; then
   CONFIG_FILE="$1"
 else
-  CONFIG_FILE="etc/terraform-$(dpkg --print-architecture).conf"
+  CONFIG_FILE="etc/mkosi-$(dpkg --print-architecture).conf"
 fi
 BASE_DIR="$PWD"
 source "$BASE_DIR"/"$CONFIG_FILE"
@@ -24,7 +24,7 @@ echo -e "
 "
 
 apt-get update
-apt-get install -y live-build patch gnupg2 binutils zstd
+apt-get install -y mkosi patch gnupg2 binutils zstd
 
 # The Debian repositories don't seem to have the `ubuntu-keyring` or `ubuntu-archive-keyring` packages
 # anymore, so we add the archive keys manually. This may need to be updated if Ubuntu changes their signing keys
@@ -32,9 +32,6 @@ apt-get install -y live-build patch gnupg2 binutils zstd
 # system and run `gpg --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-xxxx-archive.gpg --list-public-keys `
 gpg --homedir /tmp --no-default-keyring --keyring /etc/apt/trusted.gpg --recv-keys --keyserver keyserver.ubuntu.com F6ECB3762474EDA9D21B7022871920D1991BC93C
 
-# TODO: Remove this once debootstrap can natively build noble images:
-ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/noble
-
 build () {
   BUILD_ARCH="$1"
 
@@ -45,7 +42,7 @@ build () {
   rm -rf config auto
   cp -r "$BASE_DIR"/etc/* .
   # Make sure conffile specified as arg has correct name
-  cp -f "$BASE_DIR"/"$CONFIG_FILE" terraform.conf
+  cp -f "$BASE_DIR"/"$CONFIG_FILE" mkosi.conf
 
   # copy appcenter list & key
   if [ "$INCLUDE_APPCENTER" = "yes" ]; then
@@ -55,24 +52,17 @@ build () {
 
   echo -e "
 #------------------#
-# LIVE-BUILD CLEAN #
+# MKOSI CLEAN #
 #------------------#
 "
-  lb clean
-
-  echo -e "
-#-------------------#
-# LIVE-BUILD CONFIG #
-#-------------------#
-"
-  lb config
+  mkosi clean
 
   echo -e "
 #------------------#
-# LIVE-BUILD BUILD #
+# MKOSI BUILD #
 #------------------#
 "
-  lb build
+  mkosi build
 
   echo -e "
 #---------------------------#

From 002f4e585503927c0cccfa7cc2d198bd79d81d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 11:45:43 -0800
Subject: [PATCH 4/9] Use terraform and mkosi conf

---
 build.sh                                      | 22 +++++++++++--------
 ...-daily-8.1-azure-amd64.conf => mkosi.conf} | 10 ---------
 2 files changed, 13 insertions(+), 19 deletions(-)
 rename etc/{mkosi-daily-8.1-azure-amd64.conf => mkosi.conf} (59%)

diff --git a/build.sh b/build.sh
index aad0d1e3..f92d1098 100755
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,7 @@ fi
 if [ -n "$1" ]; then
   CONFIG_FILE="$1"
 else
-  CONFIG_FILE="etc/mkosi-$(dpkg --print-architecture).conf"
+  CONFIG_FILE="etc/terraform-$(dpkg --print-architecture).conf"
 fi
 BASE_DIR="$PWD"
 source "$BASE_DIR"/"$CONFIG_FILE"
@@ -42,7 +42,7 @@ build () {
   rm -rf config auto
   cp -r "$BASE_DIR"/etc/* .
   # Make sure conffile specified as arg has correct name
-  cp -f "$BASE_DIR"/"$CONFIG_FILE" mkosi.conf
+  cp -f "$BASE_DIR"/"$CONFIG_FILE" terraform.conf
 
   # copy appcenter list & key
   if [ "$INCLUDE_APPCENTER" = "yes" ]; then
@@ -50,6 +50,11 @@ build () {
     cp "config/appcenter/appcenter.key.binary" "config/archives/appcenter.key.binary"
   fi
 
+  YYYYMMDD="$(date +%Y%m%d)"
+  OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
+  mkdir -p "$OUTPUT_DIR"
+  FNAME="elementaryos-$VERSION-$CHANNEL-$BUILD_ARCH.$YYYYMMDD$OUTPUT_SUFFIX"
+
   echo -e "
 #------------------#
 # MKOSI CLEAN #
@@ -62,7 +67,12 @@ build () {
 # MKOSI BUILD #
 #------------------#
 "
-  mkosi build
+  mkosi build \
+    --distribution=ubuntu \
+    --release="$BASECODENAME" \
+    --mirror="$MIRROR_URL" \
+    --ouput=$FNAME \
+    --output-directory=$OUTPUT_DIR
 
   echo -e "
 #---------------------------#
@@ -70,12 +80,6 @@ build () {
 #---------------------------#
 "
 
-  YYYYMMDD="$(date +%Y%m%d)"
-  OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
-  mkdir -p "$OUTPUT_DIR"
-  FNAME="elementaryos-$VERSION-$CHANNEL-$BUILD_ARCH.$YYYYMMDD$OUTPUT_SUFFIX"
-  mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
-
   # cd into output to so {FNAME}.sha256.txt only
   # includes the filename and not the path to
   # our file.
diff --git a/etc/mkosi-daily-8.1-azure-amd64.conf b/etc/mkosi.conf
similarity index 59%
rename from etc/mkosi-daily-8.1-azure-amd64.conf
rename to etc/mkosi.conf
index aec3c73b..23e56208 100644
--- a/etc/mkosi-daily-8.1-azure-amd64.conf
+++ b/etc/mkosi.conf
@@ -2,27 +2,17 @@
 # SPDX-FileCopyrightText: 2026 elementary, Inc. (https://elementary.io)
 
 [Distribution]
-Architecture=x86-64
 Distribution=ubuntu
-Release=noble
-Mirror=http://azure.archive.ubuntu.com/ubuntu/
 Repositories=main restricted universe multiverse
 
 [Output]
 Format=disk
-Output=elementaryos-8.1-daily-amd64
-OutputDirectory=builds/amd64
-#ImageVersion=
 
 [Content]
 Packages=
     linux-image-generic
     systemd-boot
-    # elementary-desktop
-    # elementary-minimal
-    # elementary-standard
 Bootable=yes
 Bootloader=grub-signed
 BiosBootloader=grub
 ShimBootloader=signed
-#Checksum=

From 4367c8736121e86d4c4dd57424898d9506838707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 11:54:53 -0800
Subject: [PATCH 5/9] Remove biosbootloader

---
 build.sh       | 1 -
 etc/mkosi.conf | 1 -
 2 files changed, 2 deletions(-)

diff --git a/build.sh b/build.sh
index f92d1098..3381971c 100755
--- a/build.sh
+++ b/build.sh
@@ -68,7 +68,6 @@ build () {
 #------------------#
 "
   mkosi build \
-    --distribution=ubuntu \
     --release="$BASECODENAME" \
     --mirror="$MIRROR_URL" \
     --ouput=$FNAME \
diff --git a/etc/mkosi.conf b/etc/mkosi.conf
index 23e56208..5268f522 100644
--- a/etc/mkosi.conf
+++ b/etc/mkosi.conf
@@ -14,5 +14,4 @@ Packages=
     systemd-boot
 Bootable=yes
 Bootloader=grub-signed
-BiosBootloader=grub
 ShimBootloader=signed

From eb8734e6bc417812adaa7b4f305549a74e32fd2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 11:59:49 -0800
Subject: [PATCH 6/9] scale back

---
 etc/mkosi.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/etc/mkosi.conf b/etc/mkosi.conf
index 5268f522..11654886 100644
--- a/etc/mkosi.conf
+++ b/etc/mkosi.conf
@@ -13,5 +13,3 @@ Packages=
     linux-image-generic
     systemd-boot
 Bootable=yes
-Bootloader=grub-signed
-ShimBootloader=signed

From 4f86853ed01cb6471ce17050f0f6c89b3cc745f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 12:07:46 -0800
Subject: [PATCH 7/9] Revert back to full workflow

---
 .github/workflows/daily-8.1.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/daily-8.1.yml b/.github/workflows/daily-8.1.yml
index c0ee3b82..ce5f5cf8 100644
--- a/.github/workflows/daily-8.1.yml
+++ b/.github/workflows/daily-8.1.yml
@@ -32,4 +32,4 @@ jobs:
 
     - name: Build and upload daily .iso
       run: |
-        ./build.sh etc/terraform-daily-8.1-azure-${{ matrix.arch }}.conf
+        ./workflows.sh etc/terraform-daily-8.1-azure-${{ matrix.arch }}.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"

From 49fe96c4be8e479da186cd78fb99dffc3f658fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 12:14:41 -0800
Subject: [PATCH 8/9] undo for now

---
 .github/workflows/daily-8.1.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/daily-8.1.yml b/.github/workflows/daily-8.1.yml
index ce5f5cf8..c0ee3b82 100644
--- a/.github/workflows/daily-8.1.yml
+++ b/.github/workflows/daily-8.1.yml
@@ -32,4 +32,4 @@ jobs:
 
     - name: Build and upload daily .iso
       run: |
-        ./workflows.sh etc/terraform-daily-8.1-azure-${{ matrix.arch }}.conf "${{ secrets.key }}" "${{ secrets.secret }}" "${{ secrets.endpoint }}" "${{ secrets.bucket }}"
+        ./build.sh etc/terraform-daily-8.1-azure-${{ matrix.arch }}.conf

From 0ee6c4d0fd17f943bd57b5b7ee5f591daa61c274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jan 2026 14:18:08 -0800
Subject: [PATCH 9/9] Add mkosi deps

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index 3381971c..a06917ec 100755
--- a/build.sh
+++ b/build.sh
@@ -25,6 +25,7 @@ echo -e "
 
 apt-get update
 apt-get install -y mkosi patch gnupg2 binutils zstd
+mkosi dependencies | xargs -d '\n' apt-get install -y
 
 # The Debian repositories don't seem to have the `ubuntu-keyring` or `ubuntu-archive-keyring` packages
 # anymore, so we add the archive keys manually. This may need to be updated if Ubuntu changes their signing keys