From 52b787abcf1b19842259c894f8d2521b9d46da8b Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sat, 17 Aug 2024 22:29:57 -0700
Subject: [PATCH 1/7] fix: update container before starting build

---
 .github/workflows/build-docker.yml | 1 +
 .github/workflows/build-katsu.yml  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 1c45818..eed27f9 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -74,6 +74,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
 
diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml
index 155bb11..af6e7c0 100644
--- a/.github/workflows/build-katsu.yml
+++ b/.github/workflows/build-katsu.yml
@@ -89,6 +89,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
       - name: Checkout
@@ -146,6 +147,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
       - name: sanitize artifact name

From 3abe0b5fa7de57f6ec72ea1da20c56e8edaf720c Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sat, 17 Aug 2024 23:17:35 -0700
Subject: [PATCH 2/7] fix: disable rpmfusion updates repo because... rpmfusion

---
 katsu/modules/base/repodir/rpmfusion-free-updates.repo    | 6 +++---
 katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/katsu/modules/base/repodir/rpmfusion-free-updates.repo b/katsu/modules/base/repodir/rpmfusion-free-updates.repo
index 1405931..b9f296a 100644
--- a/katsu/modules/base/repodir/rpmfusion-free-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free-updates.repo
@@ -1,9 +1,10 @@
+# TODO: ENABLE THESE REPOS ONCE RPMFUSION FIXES THEIR SHIT UPSTREAM
 [rpmfusion-free-updates]
 name=RPM Fusion for Fedora $releasever - Free - Updates
 #baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
 metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
+enabled=0
+enabled_metadata=0
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
@@ -28,4 +29,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
index 6d4d825..0f2c4a9 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
@@ -1,3 +1,4 @@
+# TODO: ENABLE THESE REPOS ONCE RPMFUSION FIXES THEIR SHIT UPSTREAM
 [rpmfusion-nonfree-updates]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates
 #baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
@@ -28,4 +29,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

From f6628b0c50413b24f949c1b7eab7acc9eb531271 Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sat, 17 Aug 2024 23:20:21 -0700
Subject: [PATCH 3/7] oops

---
 katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
index 0f2c4a9..a79026c 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
@@ -3,8 +3,8 @@
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates
 #baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
 metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
+enabled=0
+enabled_metadata=0
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0

From b577b69d62734978e48aa0e599249210d3765681 Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sat, 17 Aug 2024 23:39:00 -0700
Subject: [PATCH 4/7] fix: hit rpmfusion directly

---
 katsu/modules/base/repodir/fedora-updates.repo    |  6 +++---
 katsu/modules/base/repodir/fedora.repo            |  6 +++---
 .../base/repodir/rpmfusion-free-tainted.repo      | 14 +++++++-------
 .../base/repodir/rpmfusion-free-updates.repo      | 14 +++++++-------
 katsu/modules/base/repodir/rpmfusion-free.repo    | 15 ++++++++-------
 .../base/repodir/rpmfusion-nonfree-tainted.repo   | 14 +++++++-------
 .../base/repodir/rpmfusion-nonfree-updates.repo   | 14 +++++++-------
 katsu/modules/base/repodir/rpmfusion-nonfree.repo | 15 ++++++++-------
 8 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/katsu/modules/base/repodir/fedora-updates.repo b/katsu/modules/base/repodir/fedora-updates.repo
index 9d9f2fd..5a77689 100644
--- a/katsu/modules/base/repodir/fedora-updates.repo
+++ b/katsu/modules/base/repodir/fedora-updates.repo
@@ -1,6 +1,6 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+#baseurl=https://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
 countme=1
@@ -13,7 +13,7 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
+#baseurl=https://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -25,7 +25,7 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+#baseurl=https://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/katsu/modules/base/repodir/fedora.repo b/katsu/modules/base/repodir/fedora.repo
index f9bfbb1..7750d60 100644
--- a/katsu/modules/base/repodir/fedora.repo
+++ b/katsu/modules/base/repodir/fedora.repo
@@ -1,6 +1,6 @@
 [fedora]
 name=Fedora $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+#baseurl=https://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=1
 countme=1
@@ -13,7 +13,7 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
+#baseurl=https://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -25,7 +25,7 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+#baseurl=https://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
diff --git a/katsu/modules/base/repodir/rpmfusion-free-tainted.repo b/katsu/modules/base/repodir/rpmfusion-free-tainted.repo
index 906bf6f..c497377 100644
--- a/katsu/modules/base/repodir/rpmfusion-free-tainted.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free-tainted.repo
@@ -1,7 +1,8 @@
+# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-free-tainted]
 name=RPM Fusion for Fedora $releasever - Free tainted
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
 enabled=1
 metadata_expire=6h
 type=rpm-md
@@ -11,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-tainted-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free tainted - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=6h
 type=rpm-md
@@ -22,12 +23,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-tainted-source]
 name=RPM Fusion for Fedora $releasever - Free tainted - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=6h
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/base/repodir/rpmfusion-free-updates.repo b/katsu/modules/base/repodir/rpmfusion-free-updates.repo
index b9f296a..419c21c 100644
--- a/katsu/modules/base/repodir/rpmfusion-free-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free-updates.repo
@@ -1,8 +1,8 @@
-# TODO: ENABLE THESE REPOS ONCE RPMFUSION FIXES THEIR SHIT UPSTREAM
+# TODO: We're bypassing their mirrors because they're broken
 [rpmfusion-free-updates]
 name=RPM Fusion for Fedora $releasever - Free - Updates
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
 enabled=0
 enabled_metadata=0
 type=rpm-md
@@ -12,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Updates Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
@@ -22,8 +22,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-source]
 name=RPM Fusion for Fedora $releasever - Free - Updates Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
diff --git a/katsu/modules/base/repodir/rpmfusion-free.repo b/katsu/modules/base/repodir/rpmfusion-free.repo
index e65aa5b..ee002c3 100644
--- a/katsu/modules/base/repodir/rpmfusion-free.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free.repo
@@ -1,7 +1,9 @@
+# TODO: We're bypassing their mirrors because they're broken atm
+# you'll also want to change "development" in the baseurl link to "releases" once Fedora 41 is released
 [rpmfusion-free]
 name=RPM Fusion for Fedora $releasever - Free
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
 enabled=1
 metadata_expire=14d
 type=rpm-md
@@ -11,8 +13,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -22,12 +24,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-source]
 name=RPM Fusion for Fedora $releasever - Free - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/source/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo b/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo
index ee408aa..2b7c7c6 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo
@@ -1,7 +1,8 @@
+# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-nonfree-tainted]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
 enabled=1
 metadata_expire=14d
 type=rpm-md
@@ -11,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-tainted-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -22,12 +23,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-tainted-source]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
index a79026c..1d6657e 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
@@ -1,8 +1,8 @@
-# TODO: ENABLE THESE REPOS ONCE RPMFUSION FIXES THEIR SHIT UPSTREAM
+# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-nonfree-updates]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
 enabled=0
 enabled_metadata=0
 type=rpm-md
@@ -12,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
@@ -22,8 +22,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-updates-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree.repo b/katsu/modules/base/repodir/rpmfusion-nonfree.repo
index dfb5110..b536bcd 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree.repo
@@ -1,7 +1,9 @@
+# TODO: We're bypassing their mirrors because they're broken atm
+# you'll also want to change "development" in the baseurl link to "releases" once Fedora 41 is released
 [rpmfusion-nonfree]
 name=RPM Fusion for Fedora $releasever - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
 enabled=1
 enabled_metadata=1
 metadata_expire=14d
@@ -12,8 +14,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -23,12 +25,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/source/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

From 796fdd56f6c721f6450bea6133c9e125d5510bad Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sat, 17 Aug 2024 23:43:41 -0700
Subject: [PATCH 5/7] actually bump everything to 41

---
 README.md                                           | 4 ++--
 katsu/modules/base/base.yaml                        | 3 +--
 katsu/modules/flagship/base-disk-aarch64.yaml       | 4 ++--
 katsu/modules/flagship/base-disk-x86_64.yaml        | 4 ++--
 katsu/modules/flagship/flagship-live.yaml           | 6 +++---
 katsu/modules/flagship/flagship.yaml                | 2 +-
 katsu/modules/gnome/base-disk-aarch64.yaml          | 4 ++--
 katsu/modules/gnome/base-disk-x86_64.yaml           | 4 ++--
 katsu/modules/gnome/gnome-live.yaml                 | 6 +++---
 katsu/modules/gnome/gnome.yaml                      | 4 ++--
 katsu/modules/kde/base-disk-aarch64.yaml            | 4 ++--
 katsu/modules/kde/base-disk-x86_64.yaml             | 4 ++--
 katsu/modules/kde/kde-disk.yaml                     | 2 +-
 katsu/modules/kde/kde-live.yaml                     | 6 +++---
 katsu/modules/kde/kde.yaml                          | 2 +-
 katsu/modules/live/live.yaml                        | 2 +-
 katsu/modules/pantheon/base-disk-aarch64.yaml       | 4 ++--
 katsu/modules/pantheon/base-disk-x86_64.yaml        | 4 ++--
 katsu/modules/pantheon/pantheon-live.yaml           | 6 +++---
 katsu/modules/pantheon/pantheon.yaml                | 2 +-
 katsu/modules/ports/chromebook/chromebook.yaml      | 2 +-
 katsu/modules/ports/chromebook/mt8183/flagship.yaml | 6 +++---
 katsu/modules/ports/chromebook/mt8183/gnome.yaml    | 6 +++---
 katsu/modules/ports/chromebook/mt8183/kde.yaml      | 6 +++---
 katsu/modules/ports/chromebook/mt8183/mt8183.yaml   | 2 +-
 katsu/modules/ports/chromebook/mt8183/xfce.yaml     | 6 +++---
 katsu/modules/ports/chromebook/mt8192/flagship.yaml | 6 +++---
 katsu/modules/ports/chromebook/mt8192/gnome.yaml    | 6 +++---
 katsu/modules/ports/chromebook/mt8192/kde.yaml      | 6 +++---
 katsu/modules/ports/chromebook/mt8192/mt8192.yaml   | 2 +-
 katsu/modules/ports/chromebook/mt8192/xfce.yaml     | 6 +++---
 katsu/modules/ports/chromebook/sc7180/flagship.yaml | 6 +++---
 katsu/modules/ports/chromebook/sc7180/gnome.yaml    | 6 +++---
 katsu/modules/ports/chromebook/sc7180/kde.yaml      | 6 +++---
 katsu/modules/ports/chromebook/sc7180/sc7180.yaml   | 2 +-
 katsu/modules/ports/chromebook/sc7180/xfce.yaml     | 6 +++---
 katsu/modules/ports/chromebook/stoney/flagship.yaml | 6 +++---
 katsu/modules/ports/chromebook/stoney/gnome.yaml    | 6 +++---
 katsu/modules/ports/chromebook/stoney/kde.yaml      | 6 +++---
 katsu/modules/ports/chromebook/stoney/stoney.yaml   | 2 +-
 katsu/modules/ports/chromebook/stoney/xfce.yaml     | 6 +++---
 katsu/modules/ports/chromebook/x86_64/flagship.yaml | 6 +++---
 katsu/modules/ports/chromebook/x86_64/gnome.yaml    | 6 +++---
 katsu/modules/ports/chromebook/x86_64/kde.yaml      | 6 +++---
 katsu/modules/ports/chromebook/x86_64/xfce.yaml     | 6 +++---
 katsu/modules/xfce/base-disk-aarch64.yaml           | 4 ++--
 katsu/modules/xfce/base-disk-x86_64.yaml            | 4 ++--
 katsu/modules/xfce/xfce-live.yaml                   | 6 +++---
 katsu/modules/xfce/xfce.yaml                        | 2 +-
 49 files changed, 111 insertions(+), 112 deletions(-)

diff --git a/README.md b/README.md
index b20ec1a..e3434ea 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ Ultramarine also offers a minimal base Docker image, in rare cases when you want
 
 The image itself is similar to the vanilla Fedora image, but includes the Ultramarine Linux repositories and RPMFusion repositories. This may prove useful for some users who want a Fedora-like environment, but with some extra packages.
 
-## Status of Images (UM40)
+## Status of Images (UM41)
 
 ### Notes
 
 - Pantheon is not currently being built
 - Chromebook images are shown as failing due to me not setting them up to build yet
-- 
+-
diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml
index 0e1b94b..74e827c 100644
--- a/katsu/modules/base/base.yaml
+++ b/katsu/modules/base/base.yaml
@@ -13,7 +13,7 @@ scripts:
       file: buildstamp.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
   repodir: repodir
   options:
     - --setopt=cachedir=/var/cache/dnf
@@ -76,4 +76,3 @@ dnf:
 #     - ultramarine-release
 #     - ultramarine-repos
 #     - "ultramarine-logos*"
-
diff --git a/katsu/modules/flagship/base-disk-aarch64.yaml b/katsu/modules/flagship/base-disk-aarch64.yaml
index 30e08fd..d1c58e1 100644
--- a/katsu/modules/flagship/base-disk-aarch64.yaml
+++ b/katsu/modules/flagship/base-disk-aarch64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Flagship Edition)
+distro: Ultramarine Linux 41 (Flagship Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,5 +43,5 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
   arch: aarch64
diff --git a/katsu/modules/flagship/base-disk-x86_64.yaml b/katsu/modules/flagship/base-disk-x86_64.yaml
index 4d917b0..604ebd2 100644
--- a/katsu/modules/flagship/base-disk-x86_64.yaml
+++ b/katsu/modules/flagship/base-disk-x86_64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Flagship Edition)
+distro: Ultramarine Linux 41 (Flagship Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,4 +43,4 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
index 3d58570..c2ad1ae 100644
--- a/katsu/modules/flagship/flagship-live.yaml
+++ b/katsu/modules/flagship/flagship-live.yaml
@@ -5,9 +5,9 @@ import:
   - ../live/live.yaml
   - flagship.yaml
 
-distro: Ultramarine Linux 40 (Flagship Edition)
+distro: Ultramarine Linux 41 (Flagship Edition)
 
-out_file: ultramarine-flagship-40-live.iso
+out_file: ultramarine-flagship-41-live.iso
 
 bootloader: grub
 
@@ -23,4 +23,4 @@ scripts:
       file: ./flagship-live.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/flagship/flagship.yaml b/katsu/modules/flagship/flagship.yaml
index a6a6e25..dee2857 100644
--- a/katsu/modules/flagship/flagship.yaml
+++ b/katsu/modules/flagship/flagship.yaml
@@ -5,7 +5,7 @@ scripts:
       file: ./flagship-extra.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
   exclude:
     - budgie-desktop-defaults
     - budgie-backgrounds
diff --git a/katsu/modules/gnome/base-disk-aarch64.yaml b/katsu/modules/gnome/base-disk-aarch64.yaml
index e5916ad..c243aa7 100644
--- a/katsu/modules/gnome/base-disk-aarch64.yaml
+++ b/katsu/modules/gnome/base-disk-aarch64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (GNOME Edition)
+distro: Ultramarine Linux 41 (GNOME Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,5 +43,5 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
   arch: aarch64
diff --git a/katsu/modules/gnome/base-disk-x86_64.yaml b/katsu/modules/gnome/base-disk-x86_64.yaml
index 1105f74..94b2551 100644
--- a/katsu/modules/gnome/base-disk-x86_64.yaml
+++ b/katsu/modules/gnome/base-disk-x86_64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (GNOME Edition)
+distro: Ultramarine Linux 41 (GNOME Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,4 +43,4 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
index 4e506f1..e42521e 100644
--- a/katsu/modules/gnome/gnome-live.yaml
+++ b/katsu/modules/gnome/gnome-live.yaml
@@ -5,9 +5,9 @@ import:
   - ../live/live.yaml
   - gnome.yaml
 
-distro: Ultramarine GNOME 40
+distro: Ultramarine GNOME 41
 
-out_file: ultramarine-gnome-40-live.iso
+out_file: ultramarine-gnome-41-live.iso
 
 bootloader: grub
 
@@ -23,4 +23,4 @@ scripts:
       file: gnome-live.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/gnome/gnome.yaml b/katsu/modules/gnome/gnome.yaml
index 126eaef..915f97c 100644
--- a/katsu/modules/gnome/gnome.yaml
+++ b/katsu/modules/gnome/gnome.yaml
@@ -1,5 +1,5 @@
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - "@ultramarine-gnome-product-environment"
     - ultramarine-release-gnome
@@ -9,4 +9,4 @@ scripts:
   post:
     - id: gnome-initial-setup
       name: Set GNOME Initial Setup to run
-      file: gnome-initial-setup.sh
\ No newline at end of file
+      file: gnome-initial-setup.sh
diff --git a/katsu/modules/kde/base-disk-aarch64.yaml b/katsu/modules/kde/base-disk-aarch64.yaml
index 244d64d..830c692 100644
--- a/katsu/modules/kde/base-disk-aarch64.yaml
+++ b/katsu/modules/kde/base-disk-aarch64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (KDE Edition)
+distro: Ultramarine Linux 41 (KDE Edition)
 
 # users:
 #   - username: ultramarine
@@ -44,5 +44,5 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
   arch: aarch64
diff --git a/katsu/modules/kde/base-disk-x86_64.yaml b/katsu/modules/kde/base-disk-x86_64.yaml
index 14328a2..bac63ce 100644
--- a/katsu/modules/kde/base-disk-x86_64.yaml
+++ b/katsu/modules/kde/base-disk-x86_64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (KDE Edition)
+distro: Ultramarine Linux 41 (KDE Edition)
 
 # users:
 #   - username: ultramarine
@@ -44,4 +44,4 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/kde/kde-disk.yaml b/katsu/modules/kde/kde-disk.yaml
index 4a12e0f..7f39d62 100644
--- a/katsu/modules/kde/kde-disk.yaml
+++ b/katsu/modules/kde/kde-disk.yaml
@@ -1,4 +1,4 @@
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - initial-setup-gui-wayland-plasma # Use KWin version of initial-setup
diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/kde/kde-live.yaml
index c79f080..e8ce16b 100644
--- a/katsu/modules/kde/kde-live.yaml
+++ b/katsu/modules/kde/kde-live.yaml
@@ -5,9 +5,9 @@ import:
   - ../live/live.yaml
   - kde.yaml
 
-distro: Ultramarine Linux 40 (KDE Edition)
+distro: Ultramarine Linux 41 (KDE Edition)
 
-out_file: ultramarine-kde-40-live.iso
+out_file: ultramarine-kde-41-live.iso
 
 scripts:
   post:
@@ -23,4 +23,4 @@ iso:
   volume_id: UM-Kd-Live
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml
index 9b624b7..5fda47e 100644
--- a/katsu/modules/kde/kde.yaml
+++ b/katsu/modules/kde/kde.yaml
@@ -1,5 +1,5 @@
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     #beta - still need to set up our own comps
     - "@ultramarine-kde-product-environment"
diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml
index 8952577..5f7df4e 100644
--- a/katsu/modules/live/live.yaml
+++ b/katsu/modules/live/live.yaml
@@ -4,7 +4,7 @@ scripts:
       name: Set up Live Image
       file: live.sh
 dnf:
-  releasever: 40
+  releasever: 41
   exclude:
     - fedora-release*
     - generic-release*
diff --git a/katsu/modules/pantheon/base-disk-aarch64.yaml b/katsu/modules/pantheon/base-disk-aarch64.yaml
index 094e0ec..0ac6efd 100644
--- a/katsu/modules/pantheon/base-disk-aarch64.yaml
+++ b/katsu/modules/pantheon/base-disk-aarch64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Pantheon Edition)
+distro: Ultramarine Linux 41 (Pantheon Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,5 +43,5 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
   arch: aarch64
diff --git a/katsu/modules/pantheon/base-disk-x86_64.yaml b/katsu/modules/pantheon/base-disk-x86_64.yaml
index ab10d2f..51ee21b 100644
--- a/katsu/modules/pantheon/base-disk-x86_64.yaml
+++ b/katsu/modules/pantheon/base-disk-x86_64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Pantheon Edition)
+distro: Ultramarine Linux 41 (Pantheon Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,4 +43,4 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml
index e48e283..5f4ebfb 100644
--- a/katsu/modules/pantheon/pantheon-live.yaml
+++ b/katsu/modules/pantheon/pantheon-live.yaml
@@ -4,7 +4,7 @@ import:
   - ../base/base.yaml
   - ../live/live.yaml
   - pantheon.yaml
-out_file: ultramarine-pantheon-40-live.iso
+out_file: ultramarine-pantheon-41-live.iso
 
 scripts:
   post:
@@ -12,7 +12,7 @@ scripts:
       name: Set up Pantheon Live
       file: ./pantheon-live.sh
 
-distro: Ultramarine Linux 40 (Pantheon Edition)
+distro: Ultramarine Linux 41 (Pantheon Edition)
 
 bootloader: grub
 
@@ -22,4 +22,4 @@ iso:
   volume_id: UM-Pa-Live
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/pantheon/pantheon.yaml b/katsu/modules/pantheon/pantheon.yaml
index a116893..95bd304 100644
--- a/katsu/modules/pantheon/pantheon.yaml
+++ b/katsu/modules/pantheon/pantheon.yaml
@@ -1,7 +1,7 @@
 builder: dnf
 
 dnf:
-  releasever: 40
+  releasever: 41
   exclude:
     - gnome-tour
     - gnome-shell
diff --git a/katsu/modules/ports/chromebook/chromebook.yaml b/katsu/modules/ports/chromebook/chromebook.yaml
index 46643ee..335ebfc 100644
--- a/katsu/modules/ports/chromebook/chromebook.yaml
+++ b/katsu/modules/ports/chromebook/chromebook.yaml
@@ -17,7 +17,7 @@ scripts:
       file: submarine.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - cros-keyboard-map
     - depthcharge-tools
diff --git a/katsu/modules/ports/chromebook/mt8183/flagship.yaml b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
index 97acc05..3419531 100644
--- a/katsu/modules/ports/chromebook/mt8183/flagship.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../flagship/flagship.yaml
   - ../../../flagship/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Flagship (mt8183 Chromebook)
+distro: Ultramarine Linux 41 Flagship (mt8183 Chromebook)
 
-out_file: ultramarine-cbe-mt8183-flagship-40.img
+out_file: ultramarine-cbe-mt8183-flagship-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8183/gnome.yaml b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
index dffa037..cb002fe 100644
--- a/katsu/modules/ports/chromebook/mt8183/gnome.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../gnome/gnome.yaml
   - ../../../gnome/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 GNOME (mt8183 Chromebook)
+distro: Ultramarine Linux 41 GNOME (mt8183 Chromebook)
 
-out_file: ultramarine-cbe-mt8183-gnome-40.img
+out_file: ultramarine-cbe-mt8183-gnome-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8183/kde.yaml b/katsu/modules/ports/chromebook/mt8183/kde.yaml
index 80ae2e5..0cedf09 100644
--- a/katsu/modules/ports/chromebook/mt8183/kde.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/kde.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../kde/kde.yaml
   - ../../../kde/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 KDE (mt8183 Chromebook)
+distro: Ultramarine Linux 41 KDE (mt8183 Chromebook)
 
-out_file: ultramarine-cbe-mt8183-kde-40.img
+out_file: ultramarine-cbe-mt8183-kde-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
index f1e8bff..7c9edf1 100644
--- a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
@@ -4,7 +4,7 @@ import:
   - ../chromebook.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - kernel-mt8183
     - kernel-mt8183-devel
diff --git a/katsu/modules/ports/chromebook/mt8183/xfce.yaml b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
index 0df1354..c5264f6 100644
--- a/katsu/modules/ports/chromebook/mt8183/xfce.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../xfce/xfce.yaml
   - ../../../xfce/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Xfce (mt8183 Chromebook)
+distro: Ultramarine Linux 41 Xfce (mt8183 Chromebook)
 
-out_file: ultramarine-cbe-mt8183-xfce-40.img
+out_file: ultramarine-cbe-mt8183-xfce-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8192/flagship.yaml b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
index 67608b7..c1e986b 100644
--- a/katsu/modules/ports/chromebook/mt8192/flagship.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../flagship/flagship.yaml
   - ../../../flagship/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Flagship (mt8192 Chromebook)
+distro: Ultramarine Linux 41 Flagship (mt8192 Chromebook)
 
-out_file: ultramarine-cbe-mt8192-flagship-40.img
+out_file: ultramarine-cbe-mt8192-flagship-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8192/gnome.yaml b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
index 5808587..2af677a 100644
--- a/katsu/modules/ports/chromebook/mt8192/gnome.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../gnome/gnome.yaml
   - ../../../gnome/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 GNOME (mt8192 Chromebook)
+distro: Ultramarine Linux 41 GNOME (mt8192 Chromebook)
 
-out_file: ultramarine-cbe-mt8192-gnome-40.img
+out_file: ultramarine-cbe-mt8192-gnome-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8192/kde.yaml b/katsu/modules/ports/chromebook/mt8192/kde.yaml
index 8340896..63a977d 100644
--- a/katsu/modules/ports/chromebook/mt8192/kde.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/kde.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../kde/kde.yaml
   - ../../../kde/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 KDE (mt8192 Chromebook)
+distro: Ultramarine Linux 41 KDE (mt8192 Chromebook)
 
-out_file: ultramarine-cbe-mt8192-kde-40.img
+out_file: ultramarine-cbe-mt8192-kde-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
index ae1b2d3..00f10ff 100644
--- a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
@@ -4,7 +4,7 @@ import:
   - ../chromebook.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - kernel-mt8192
     - kernel-mt8192-devel
diff --git a/katsu/modules/ports/chromebook/mt8192/xfce.yaml b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
index 7f504df..0a1f575 100644
--- a/katsu/modules/ports/chromebook/mt8192/xfce.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../xfce/xfce.yaml
   - ../../../xfce/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Xfce (mt8192 Chromebook)
+distro: Ultramarine Linux 41 Xfce (mt8192 Chromebook)
 
-out_file: ultramarine-cbe-mt8192-xfce-40.img
+out_file: ultramarine-cbe-mt8192-xfce-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/sc7180/flagship.yaml b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
index ce69aa0..b6c6c9a 100644
--- a/katsu/modules/ports/chromebook/sc7180/flagship.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../flagship/flagship.yaml
   - ../../../flagship/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Flagship (sc7180 Chromebook)
+distro: Ultramarine Linux 41 Flagship (sc7180 Chromebook)
 
-out_file: ultramarine-cbe-sc7180-flagship-40.img
+out_file: ultramarine-cbe-sc7180-flagship-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/sc7180/gnome.yaml b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
index b6334c0..5f9b5b8 100644
--- a/katsu/modules/ports/chromebook/sc7180/gnome.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../gnome/gnome.yaml
   - ../../../gnome/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 GNOME (sc7180 Chromebook)
+distro: Ultramarine Linux 41 GNOME (sc7180 Chromebook)
 
-out_file: ultramarine-cbe-sc7180-gnome-40.img
+out_file: ultramarine-cbe-sc7180-gnome-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/sc7180/kde.yaml b/katsu/modules/ports/chromebook/sc7180/kde.yaml
index ad6eef3..e98ab2d 100644
--- a/katsu/modules/ports/chromebook/sc7180/kde.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/kde.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../kde/kde.yaml
   - ../../../kde/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 KDE (sc7180 Chromebook)
+distro: Ultramarine Linux 41 KDE (sc7180 Chromebook)
 
-out_file: ultramarine-cbe-sc7180-kde-40.img
+out_file: ultramarine-cbe-sc7180-kde-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
index cae1d93..1a07e21 100644
--- a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
@@ -4,7 +4,7 @@ import:
   - ../chromebook.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - kernel-sc7180
     - kernel-sc7180-devel
diff --git a/katsu/modules/ports/chromebook/sc7180/xfce.yaml b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
index 4824d06..6e2f05b 100644
--- a/katsu/modules/ports/chromebook/sc7180/xfce.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../xfce/xfce.yaml
   - ../../../xfce/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Xfce (sc7180 Chromebook)
+distro: Ultramarine Linux 41 Xfce (sc7180 Chromebook)
 
-out_file: ultramarine-cbe-sc7180-xfce-40.img
+out_file: ultramarine-cbe-sc7180-xfce-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/stoney/flagship.yaml b/katsu/modules/ports/chromebook/stoney/flagship.yaml
index 71bdf9b..e97f5e8 100644
--- a/katsu/modules/ports/chromebook/stoney/flagship.yaml
+++ b/katsu/modules/ports/chromebook/stoney/flagship.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../flagship/flagship.yaml
   - ../../../flagship/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Flagship (Stoney Chromebook)
+distro: Ultramarine Linux 41 Flagship (Stoney Chromebook)
 
-out_file: ultramarine-cbe-stoney-flagship-40.img
+out_file: ultramarine-cbe-stoney-flagship-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/stoney/gnome.yaml b/katsu/modules/ports/chromebook/stoney/gnome.yaml
index 8d0c6d4..223d016 100644
--- a/katsu/modules/ports/chromebook/stoney/gnome.yaml
+++ b/katsu/modules/ports/chromebook/stoney/gnome.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../gnome/gnome.yaml
   - ../../../gnome/base-disk-x86_64.yaml
 
-distro: Ultramarine Linux 40 GNOME (Stoney Chromebook)
+distro: Ultramarine Linux 41 GNOME (Stoney Chromebook)
 
-out_file: ultramarine-cbe-stoney-gnome-40.img
+out_file: ultramarine-cbe-stoney-gnome-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/stoney/kde.yaml b/katsu/modules/ports/chromebook/stoney/kde.yaml
index 29209a5..2848127 100644
--- a/katsu/modules/ports/chromebook/stoney/kde.yaml
+++ b/katsu/modules/ports/chromebook/stoney/kde.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../kde/kde.yaml
   - ../../../kde/base-disk-x86_64.yaml
 
-distro: Ultramarine Linux 40 KDE (Stoney Chromebook)
+distro: Ultramarine Linux 41 KDE (Stoney Chromebook)
 
-out_file: ultramarine-cbe-stoney-kde-40.img
+out_file: ultramarine-cbe-stoney-kde-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/stoney/stoney.yaml b/katsu/modules/ports/chromebook/stoney/stoney.yaml
index ac00d29..0beb89b 100644
--- a/katsu/modules/ports/chromebook/stoney/stoney.yaml
+++ b/katsu/modules/ports/chromebook/stoney/stoney.yaml
@@ -4,7 +4,7 @@ import:
   - ../chromebook.yaml
 
 dnf:
-  releasever: 40
+  releasever: 41
   packages:
     - kernel-stoneyridge
     - kernel-stoneyridge-devel
diff --git a/katsu/modules/ports/chromebook/stoney/xfce.yaml b/katsu/modules/ports/chromebook/stoney/xfce.yaml
index e28536d..82ed7d9 100644
--- a/katsu/modules/ports/chromebook/stoney/xfce.yaml
+++ b/katsu/modules/ports/chromebook/stoney/xfce.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../xfce/xfce.yaml
   - ../../../xfce/base-disk-aarch64.yaml
 
-distro: Ultramarine Linux 40 Xfce (Stoney Chromebook)
+distro: Ultramarine Linux 41 Xfce (Stoney Chromebook)
 
-out_file: ultramarine-cbe-stoney-xfce-40.img
+out_file: ultramarine-cbe-stoney-xfce-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/x86_64/flagship.yaml b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
index 8c161c3..424cbf3 100644
--- a/katsu/modules/ports/chromebook/x86_64/flagship.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../flagship/flagship.yaml
   - ../../../flagship/base-disk-x86_64.yaml
 
-distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+distro: Ultramarine Linux 41 Flagship (Chromebook Edition)
 
-out_file: ultramarine-cbe-flagship-40.img
+out_file: ultramarine-cbe-flagship-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/x86_64/gnome.yaml b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
index 7240bb0..43ea055 100644
--- a/katsu/modules/ports/chromebook/x86_64/gnome.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../gnome/gnome.yaml
   - ../../../gnome/base-disk-x86_64.yaml
 
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+distro: Ultramarine Linux 41 GNOME (Chromebook Edition)
 
-out_file: ultramarine-cbe-gnome-40.img
+out_file: ultramarine-cbe-gnome-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/x86_64/kde.yaml b/katsu/modules/ports/chromebook/x86_64/kde.yaml
index 2f6eb65..6cbe4b5 100644
--- a/katsu/modules/ports/chromebook/x86_64/kde.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/kde.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../kde/kde.yaml
   - ../../../kde/base-disk-x86_64.yaml
 
-distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+distro: Ultramarine Linux 41 KDE (Chromebook Edition)
 
-out_file: ultramarine-cbe-kde-40.img
+out_file: ultramarine-cbe-kde-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/ports/chromebook/x86_64/xfce.yaml b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
index 635e5a0..56b1757 100644
--- a/katsu/modules/ports/chromebook/x86_64/xfce.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
@@ -5,13 +5,13 @@ import:
   - ../../../xfce/xfce.yaml
   - ../../../xfce/base-disk-x86.yaml
 
-distro: Ultramarine Linux 40 Xfce (Chromebook Edition)
+distro: Ultramarine Linux 41 Xfce (Chromebook Edition)
 
-out_file: ultramarine-cbe-xfce-40.img
+out_file: ultramarine-cbe-xfce-41.img
 
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/xfce/base-disk-aarch64.yaml b/katsu/modules/xfce/base-disk-aarch64.yaml
index 02cb3c4..66d40fb 100644
--- a/katsu/modules/xfce/base-disk-aarch64.yaml
+++ b/katsu/modules/xfce/base-disk-aarch64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Xfce Edition)
+distro: Ultramarine Linux 41 (Xfce Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,5 +43,5 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
   arch: aarch64
diff --git a/katsu/modules/xfce/base-disk-x86_64.yaml b/katsu/modules/xfce/base-disk-x86_64.yaml
index d280351..e1f7833 100644
--- a/katsu/modules/xfce/base-disk-x86_64.yaml
+++ b/katsu/modules/xfce/base-disk-x86_64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Xfce Edition)
+distro: Ultramarine Linux 41 (Xfce Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,4 +43,4 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml
index 173dea7..785f083 100644
--- a/katsu/modules/xfce/xfce-live.yaml
+++ b/katsu/modules/xfce/xfce-live.yaml
@@ -5,9 +5,9 @@ import:
   - ../live/live.yaml
   - xfce.yaml
 
-distro: Ultramarine Linux 40 (Xfce Edition)
+distro: Ultramarine Linux 41 (Xfce Edition)
 
-out_file: ultramarine-xfce-40-live.iso
+out_file: ultramarine-xfce-41-live.iso
 
 bootloader: grub
 
@@ -23,4 +23,4 @@ scripts:
       file: ./xfce-live.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
diff --git a/katsu/modules/xfce/xfce.yaml b/katsu/modules/xfce/xfce.yaml
index ad18b98..5bc8a9e 100644
--- a/katsu/modules/xfce/xfce.yaml
+++ b/katsu/modules/xfce/xfce.yaml
@@ -5,7 +5,7 @@ scripts:
       file: ./xfce-extra.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
   exclude:
     - ultramarine-backgrounds-compat
     - "dnfdragora*" # Jade doesn't like this for some reason???

From a5ab9b35176a8f4309015fe2e759e623617e8c25 Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sun, 18 Aug 2024 18:05:52 -0700
Subject: [PATCH 6/7] fix: use dnf4 because of dnf5 comps issue

---
 katsu/modules/base/base-disk-aarch64.yaml           | 2 ++
 katsu/modules/base/base-disk-x86_64.yaml            | 1 +
 katsu/modules/base/base-disk.yaml                   | 1 +
 katsu/modules/base/base-docker-aarch64.yaml         | 1 +
 katsu/modules/base/base-docker-x86_64.yaml          | 1 +
 katsu/modules/base/base-docker.yaml                 | 1 +
 katsu/modules/base/base.yaml                        | 1 +
 katsu/modules/flagship/base-disk-aarch64.yaml       | 1 +
 katsu/modules/flagship/base-disk-x86_64.yaml        | 1 +
 katsu/modules/flagship/flagship-live.yaml           | 1 +
 katsu/modules/flagship/flagship.yaml                | 1 +
 katsu/modules/gnome/base-disk-aarch64.yaml          | 1 +
 katsu/modules/gnome/base-disk-x86_64.yaml           | 1 +
 katsu/modules/gnome/gnome-live.yaml                 | 1 +
 katsu/modules/gnome/gnome.yaml                      | 1 +
 katsu/modules/kde/base-disk-aarch64.yaml            | 1 +
 katsu/modules/kde/base-disk-x86_64.yaml             | 1 +
 katsu/modules/kde/kde-disk.yaml                     | 1 +
 katsu/modules/kde/kde-live.yaml                     | 1 +
 katsu/modules/kde/kde.yaml                          | 1 +
 katsu/modules/live/live.yaml                        | 1 +
 katsu/modules/pantheon/base-disk-aarch64.yaml       | 1 +
 katsu/modules/pantheon/base-disk-x86_64.yaml        | 1 +
 katsu/modules/pantheon/pantheon-live.yaml           | 1 +
 katsu/modules/pantheon/pantheon.yaml                | 1 +
 katsu/modules/ports/chromebook/chromebook.yaml      | 1 +
 katsu/modules/ports/chromebook/mt8183/flagship.yaml | 1 +
 katsu/modules/ports/chromebook/mt8183/gnome.yaml    | 1 +
 katsu/modules/ports/chromebook/mt8183/kde.yaml      | 1 +
 katsu/modules/ports/chromebook/mt8183/mt8183.yaml   | 1 +
 katsu/modules/ports/chromebook/mt8183/xfce.yaml     | 1 +
 katsu/modules/ports/chromebook/mt8192/flagship.yaml | 1 +
 katsu/modules/ports/chromebook/mt8192/gnome.yaml    | 1 +
 katsu/modules/ports/chromebook/mt8192/kde.yaml      | 1 +
 katsu/modules/ports/chromebook/mt8192/mt8192.yaml   | 1 +
 katsu/modules/ports/chromebook/mt8192/xfce.yaml     | 1 +
 katsu/modules/ports/chromebook/sc7180/flagship.yaml | 1 +
 katsu/modules/ports/chromebook/sc7180/gnome.yaml    | 1 +
 katsu/modules/ports/chromebook/sc7180/kde.yaml      | 1 +
 katsu/modules/ports/chromebook/sc7180/sc7180.yaml   | 1 +
 katsu/modules/ports/chromebook/sc7180/xfce.yaml     | 1 +
 katsu/modules/ports/chromebook/stoney/flagship.yaml | 1 +
 katsu/modules/ports/chromebook/stoney/gnome.yaml    | 1 +
 katsu/modules/ports/chromebook/stoney/kde.yaml      | 1 +
 katsu/modules/ports/chromebook/stoney/stoney.yaml   | 1 +
 katsu/modules/ports/chromebook/stoney/xfce.yaml     | 1 +
 katsu/modules/ports/chromebook/x86_64/flagship.yaml | 1 +
 katsu/modules/ports/chromebook/x86_64/gnome.yaml    | 1 +
 katsu/modules/ports/chromebook/x86_64/kde.yaml      | 1 +
 katsu/modules/ports/chromebook/x86_64/xfce.yaml     | 1 +
 katsu/modules/xfce/base-disk-aarch64.yaml           | 1 +
 katsu/modules/xfce/base-disk-x86_64.yaml            | 1 +
 katsu/modules/xfce/xfce-live.yaml                   | 1 +
 katsu/modules/xfce/xfce.yaml                        | 1 +
 54 files changed, 55 insertions(+)

diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml
index d13a396..a02d012 100644
--- a/katsu/modules/base/base-disk-aarch64.yaml
+++ b/katsu/modules/base/base-disk-aarch64.yaml
@@ -14,6 +14,8 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
+exec: dnf4
   arch: aarch64
   packages:
     - ultramarine-release-identity-basic
diff --git a/katsu/modules/base/base-disk-x86_64.yaml b/katsu/modules/base/base-disk-x86_64.yaml
index e726921..afc30e4 100644
--- a/katsu/modules/base/base-disk-x86_64.yaml
+++ b/katsu/modules/base/base-disk-x86_64.yaml
@@ -14,6 +14,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - ultramarine-release-identity-basic
     - ultramarine-release-basic
diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml
index 172c98c..a883d21 100644
--- a/katsu/modules/base/base-disk.yaml
+++ b/katsu/modules/base/base-disk.yaml
@@ -8,6 +8,7 @@ scripts:
       file: disk-setup.sh
 dnf:
   releasever: 41
+  exec: dnf4
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True
diff --git a/katsu/modules/base/base-docker-aarch64.yaml b/katsu/modules/base/base-docker-aarch64.yaml
index 41ed7fb..3a69cc1 100644
--- a/katsu/modules/base/base-docker-aarch64.yaml
+++ b/katsu/modules/base/base-docker-aarch64.yaml
@@ -6,4 +6,5 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/base/base-docker-x86_64.yaml b/katsu/modules/base/base-docker-x86_64.yaml
index a89bf1d..81d8f68 100644
--- a/katsu/modules/base/base-docker-x86_64.yaml
+++ b/katsu/modules/base/base-docker-x86_64.yaml
@@ -6,4 +6,5 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: x86_64
diff --git a/katsu/modules/base/base-docker.yaml b/katsu/modules/base/base-docker.yaml
index 5240023..7410efa 100644
--- a/katsu/modules/base/base-docker.yaml
+++ b/katsu/modules/base/base-docker.yaml
@@ -3,6 +3,7 @@ builder: dnf
 dnf:
   repodir: repodir/
   releasever: 41
+  exec: dnf4
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True
diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml
index 74e827c..328ff80 100644
--- a/katsu/modules/base/base.yaml
+++ b/katsu/modules/base/base.yaml
@@ -14,6 +14,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   repodir: repodir
   options:
     - --setopt=cachedir=/var/cache/dnf
diff --git a/katsu/modules/flagship/base-disk-aarch64.yaml b/katsu/modules/flagship/base-disk-aarch64.yaml
index d1c58e1..68e8dcd 100644
--- a/katsu/modules/flagship/base-disk-aarch64.yaml
+++ b/katsu/modules/flagship/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/flagship/base-disk-x86_64.yaml b/katsu/modules/flagship/base-disk-x86_64.yaml
index 604ebd2..a8b293d 100644
--- a/katsu/modules/flagship/base-disk-x86_64.yaml
+++ b/katsu/modules/flagship/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
index c2ad1ae..9db8578 100644
--- a/katsu/modules/flagship/flagship-live.yaml
+++ b/katsu/modules/flagship/flagship-live.yaml
@@ -24,3 +24,4 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/flagship/flagship.yaml b/katsu/modules/flagship/flagship.yaml
index dee2857..d2ad8af 100644
--- a/katsu/modules/flagship/flagship.yaml
+++ b/katsu/modules/flagship/flagship.yaml
@@ -6,6 +6,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - budgie-desktop-defaults
     - budgie-backgrounds
diff --git a/katsu/modules/gnome/base-disk-aarch64.yaml b/katsu/modules/gnome/base-disk-aarch64.yaml
index c243aa7..2d39b64 100644
--- a/katsu/modules/gnome/base-disk-aarch64.yaml
+++ b/katsu/modules/gnome/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/gnome/base-disk-x86_64.yaml b/katsu/modules/gnome/base-disk-x86_64.yaml
index 94b2551..c6047d0 100644
--- a/katsu/modules/gnome/base-disk-x86_64.yaml
+++ b/katsu/modules/gnome/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
index e42521e..f42b5f9 100644
--- a/katsu/modules/gnome/gnome-live.yaml
+++ b/katsu/modules/gnome/gnome-live.yaml
@@ -24,3 +24,4 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/gnome/gnome.yaml b/katsu/modules/gnome/gnome.yaml
index 915f97c..48de10a 100644
--- a/katsu/modules/gnome/gnome.yaml
+++ b/katsu/modules/gnome/gnome.yaml
@@ -1,5 +1,6 @@
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - "@ultramarine-gnome-product-environment"
     - ultramarine-release-gnome
diff --git a/katsu/modules/kde/base-disk-aarch64.yaml b/katsu/modules/kde/base-disk-aarch64.yaml
index 830c692..fbf734d 100644
--- a/katsu/modules/kde/base-disk-aarch64.yaml
+++ b/katsu/modules/kde/base-disk-aarch64.yaml
@@ -45,4 +45,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/kde/base-disk-x86_64.yaml b/katsu/modules/kde/base-disk-x86_64.yaml
index bac63ce..7d162f4 100644
--- a/katsu/modules/kde/base-disk-x86_64.yaml
+++ b/katsu/modules/kde/base-disk-x86_64.yaml
@@ -45,3 +45,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/kde/kde-disk.yaml b/katsu/modules/kde/kde-disk.yaml
index 7f39d62..ccdecf9 100644
--- a/katsu/modules/kde/kde-disk.yaml
+++ b/katsu/modules/kde/kde-disk.yaml
@@ -1,4 +1,5 @@
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - initial-setup-gui-wayland-plasma # Use KWin version of initial-setup
diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/kde/kde-live.yaml
index e8ce16b..f5690e9 100644
--- a/katsu/modules/kde/kde-live.yaml
+++ b/katsu/modules/kde/kde-live.yaml
@@ -24,3 +24,4 @@ iso:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml
index 5fda47e..050c25f 100644
--- a/katsu/modules/kde/kde.yaml
+++ b/katsu/modules/kde/kde.yaml
@@ -1,5 +1,6 @@
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     #beta - still need to set up our own comps
     - "@ultramarine-kde-product-environment"
diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml
index 5f7df4e..9048980 100644
--- a/katsu/modules/live/live.yaml
+++ b/katsu/modules/live/live.yaml
@@ -5,6 +5,7 @@ scripts:
       file: live.sh
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - fedora-release*
     - generic-release*
diff --git a/katsu/modules/pantheon/base-disk-aarch64.yaml b/katsu/modules/pantheon/base-disk-aarch64.yaml
index 0ac6efd..cfa4e6d 100644
--- a/katsu/modules/pantheon/base-disk-aarch64.yaml
+++ b/katsu/modules/pantheon/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/pantheon/base-disk-x86_64.yaml b/katsu/modules/pantheon/base-disk-x86_64.yaml
index 51ee21b..15d25a7 100644
--- a/katsu/modules/pantheon/base-disk-x86_64.yaml
+++ b/katsu/modules/pantheon/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml
index 5f4ebfb..e3493ad 100644
--- a/katsu/modules/pantheon/pantheon-live.yaml
+++ b/katsu/modules/pantheon/pantheon-live.yaml
@@ -23,3 +23,4 @@ iso:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/pantheon/pantheon.yaml b/katsu/modules/pantheon/pantheon.yaml
index 95bd304..56a0bf2 100644
--- a/katsu/modules/pantheon/pantheon.yaml
+++ b/katsu/modules/pantheon/pantheon.yaml
@@ -2,6 +2,7 @@ builder: dnf
 
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - gnome-tour
     - gnome-shell
diff --git a/katsu/modules/ports/chromebook/chromebook.yaml b/katsu/modules/ports/chromebook/chromebook.yaml
index 335ebfc..8601595 100644
--- a/katsu/modules/ports/chromebook/chromebook.yaml
+++ b/katsu/modules/ports/chromebook/chromebook.yaml
@@ -18,6 +18,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - cros-keyboard-map
     - depthcharge-tools
diff --git a/katsu/modules/ports/chromebook/mt8183/flagship.yaml b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
index 3419531..dbe21e5 100644
--- a/katsu/modules/ports/chromebook/mt8183/flagship.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8183/gnome.yaml b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
index cb002fe..dd6e56c 100644
--- a/katsu/modules/ports/chromebook/mt8183/gnome.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8183/kde.yaml b/katsu/modules/ports/chromebook/mt8183/kde.yaml
index 0cedf09..59931fe 100644
--- a/katsu/modules/ports/chromebook/mt8183/kde.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
index 7c9edf1..3c394c2 100644
--- a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-mt8183
     - kernel-mt8183-devel
diff --git a/katsu/modules/ports/chromebook/mt8183/xfce.yaml b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
index c5264f6..3d57254 100644
--- a/katsu/modules/ports/chromebook/mt8183/xfce.yaml
+++ b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/flagship.yaml b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
index c1e986b..a6268bf 100644
--- a/katsu/modules/ports/chromebook/mt8192/flagship.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/gnome.yaml b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
index 2af677a..9ddc85a 100644
--- a/katsu/modules/ports/chromebook/mt8192/gnome.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/kde.yaml b/katsu/modules/ports/chromebook/mt8192/kde.yaml
index 63a977d..ce837e5 100644
--- a/katsu/modules/ports/chromebook/mt8192/kde.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
index 00f10ff..2e2da8c 100644
--- a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-mt8192
     - kernel-mt8192-devel
diff --git a/katsu/modules/ports/chromebook/mt8192/xfce.yaml b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
index 0a1f575..63ac250 100644
--- a/katsu/modules/ports/chromebook/mt8192/xfce.yaml
+++ b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/flagship.yaml b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
index b6c6c9a..0216ea5 100644
--- a/katsu/modules/ports/chromebook/sc7180/flagship.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/gnome.yaml b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
index 5f9b5b8..e010cec 100644
--- a/katsu/modules/ports/chromebook/sc7180/gnome.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/kde.yaml b/katsu/modules/ports/chromebook/sc7180/kde.yaml
index e98ab2d..53d98d1 100644
--- a/katsu/modules/ports/chromebook/sc7180/kde.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
index 1a07e21..e03f65c 100644
--- a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-sc7180
     - kernel-sc7180-devel
diff --git a/katsu/modules/ports/chromebook/sc7180/xfce.yaml b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
index 6e2f05b..7867ae3 100644
--- a/katsu/modules/ports/chromebook/sc7180/xfce.yaml
+++ b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/flagship.yaml b/katsu/modules/ports/chromebook/stoney/flagship.yaml
index e97f5e8..4a1e7f9 100644
--- a/katsu/modules/ports/chromebook/stoney/flagship.yaml
+++ b/katsu/modules/ports/chromebook/stoney/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/gnome.yaml b/katsu/modules/ports/chromebook/stoney/gnome.yaml
index 223d016..8bbfcfd 100644
--- a/katsu/modules/ports/chromebook/stoney/gnome.yaml
+++ b/katsu/modules/ports/chromebook/stoney/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/kde.yaml b/katsu/modules/ports/chromebook/stoney/kde.yaml
index 2848127..edddfc1 100644
--- a/katsu/modules/ports/chromebook/stoney/kde.yaml
+++ b/katsu/modules/ports/chromebook/stoney/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/stoney.yaml b/katsu/modules/ports/chromebook/stoney/stoney.yaml
index 0beb89b..027a83c 100644
--- a/katsu/modules/ports/chromebook/stoney/stoney.yaml
+++ b/katsu/modules/ports/chromebook/stoney/stoney.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-stoneyridge
     - kernel-stoneyridge-devel
diff --git a/katsu/modules/ports/chromebook/stoney/xfce.yaml b/katsu/modules/ports/chromebook/stoney/xfce.yaml
index 82ed7d9..ef79a95 100644
--- a/katsu/modules/ports/chromebook/stoney/xfce.yaml
+++ b/katsu/modules/ports/chromebook/stoney/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/flagship.yaml b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
index 424cbf3..e86ffb2 100644
--- a/katsu/modules/ports/chromebook/x86_64/flagship.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/gnome.yaml b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
index 43ea055..f59f276 100644
--- a/katsu/modules/ports/chromebook/x86_64/gnome.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/kde.yaml b/katsu/modules/ports/chromebook/x86_64/kde.yaml
index 6cbe4b5..edc77c6 100644
--- a/katsu/modules/ports/chromebook/x86_64/kde.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/xfce.yaml b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
index 56b1757..6ed27b8 100644
--- a/katsu/modules/ports/chromebook/x86_64/xfce.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/xfce/base-disk-aarch64.yaml b/katsu/modules/xfce/base-disk-aarch64.yaml
index 66d40fb..1bde1d9 100644
--- a/katsu/modules/xfce/base-disk-aarch64.yaml
+++ b/katsu/modules/xfce/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/xfce/base-disk-x86_64.yaml b/katsu/modules/xfce/base-disk-x86_64.yaml
index e1f7833..d7c03fa 100644
--- a/katsu/modules/xfce/base-disk-x86_64.yaml
+++ b/katsu/modules/xfce/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml
index 785f083..a1e3bc7 100644
--- a/katsu/modules/xfce/xfce-live.yaml
+++ b/katsu/modules/xfce/xfce-live.yaml
@@ -24,3 +24,4 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/xfce/xfce.yaml b/katsu/modules/xfce/xfce.yaml
index 5bc8a9e..0a5eb92 100644
--- a/katsu/modules/xfce/xfce.yaml
+++ b/katsu/modules/xfce/xfce.yaml
@@ -6,6 +6,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - ultramarine-backgrounds-compat
     - "dnfdragora*" # Jade doesn't like this for some reason???

From 13a78cd43013dbadc63c7614700f4fd47fe87d76 Mon Sep 17 00:00:00 2001
From: "lleyton@fyralabs.com" <lleyton@fyralabs.com>
Date: Sun, 18 Aug 2024 18:07:40 -0700
Subject: [PATCH 7/7] oops

---
 katsu/modules/base/base-disk-aarch64.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml
index a02d012..181d2fe 100644
--- a/katsu/modules/base/base-disk-aarch64.yaml
+++ b/katsu/modules/base/base-disk-aarch64.yaml
@@ -15,7 +15,6 @@ import:
 dnf:
   releasever: 41
   exec: dnf4
-exec: dnf4
   arch: aarch64
   packages:
     - ultramarine-release-identity-basic