diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index e406b93..e661672 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -42,7 +42,7 @@ jobs:
   image-arm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
       # Pass /dev from host to container
       # Very hacky, but it works
       # Microsoft/Github, if you're reading this,
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93789b1..e8234ac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
     runs-on: ${{ matrix.arch == 'aarch64' && 'arm64' || 'ubuntu-latest' }}
 
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4a0c11..37e46c5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   check:
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
     name: Check
     runs-on: ubuntu-latest
     steps:
@@ -48,7 +48,7 @@ jobs:
   clippy:
     name: Clippy
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
 
     steps:
       - uses: actions/checkout@v4
diff --git a/Dockerfile b/Dockerfile
index a4b92d7..982d703 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/terrapkg/builder:f38
+FROM ghcr.io/terrapkg/builder:f40
 
 RUN dnf install -y \
     xorriso \
diff --git a/src/builder.rs b/src/builder.rs
index 5ff39fb..406b6e0 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -272,7 +272,7 @@ pub trait RootBuilder {
 }
 
 fn _default_dnf() -> String {
-	String::from("dnf")
+	String::from("dnf5")
 }
 
 #[derive(Deserialize, Debug, Clone, Serialize, Default)]
@@ -348,10 +348,15 @@ impl RootBuilder for DnfRootBuilder {
 		options.append(&mut exclude.iter().map(|p| format!("--exclude={p}")).collect());
 
 		info!("Initializing system with dnf");
-		crate::chroot_run_cmd!(&chroot,
+		let res = crate::chroot_run_cmd!(&chroot,
 			$dnf install -y --releasever=$releasever --installroot=$chroot $[packages] $[options] 2>&1;
 			$dnf clean all --installroot=$chroot;
-		)?;
+		);
+
+		if let Err(e) = res {
+			tracing::error!("{} failed with error: {e:?}", self.exec);
+			info!("Katsu will continue the build process.");
+		}
 
 		info!("Setting up users");
 
diff --git a/tests/katsudon-arm.yaml b/tests/katsudon-arm.yaml
index 73783c9..2666c1d 100644
--- a/tests/katsudon-arm.yaml
+++ b/tests/katsudon-arm.yaml
@@ -47,16 +47,15 @@ packages:
   - shim-aa64
   - shim-unsigned-aarch64
 
-
 disk:
   bootloader: true
   root_format: ext4
   disk_size: 8G
 
 sys:
-  releasever: 38
+  releasever: 40
   rootpw: ultramarine
 
 script:
   init: init.sh
-  postinst: postinst.sh
\ No newline at end of file
+  postinst: postinst.sh
diff --git a/tests/katsudon-test.yaml b/tests/katsudon-test.yaml
index c8fbdb7..c399085 100644
--- a/tests/katsudon-test.yaml
+++ b/tests/katsudon-test.yaml
@@ -31,7 +31,7 @@ packages:
   - polkit
 
 sys:
-  releasever: 38
+  releasever: 40
   rootpw: ultramarine
 
 script:
diff --git a/tests/ng/katsu-arm.yaml b/tests/ng/katsu-arm.yaml
index e1a88da..27ec347 100644
--- a/tests/ng/katsu-arm.yaml
+++ b/tests/ng/katsu-arm.yaml
@@ -29,4 +29,4 @@ disk:
 
 dnf:
   arch: aarch64
-  releasever: 39
+  releasever: 40
diff --git a/tests/ng/katsu-iso-limine.yaml b/tests/ng/katsu-iso-limine.yaml
index 34ace13..5c9607a 100644
--- a/tests/ng/katsu-iso-limine.yaml
+++ b/tests/ng/katsu-iso-limine.yaml
@@ -10,7 +10,7 @@ kernel_cmdline: "quiet rhgb"
 bootloader: limine
 
 dnf:
-  releasever: 39
+  releasever: 40
   options:
     - --setopt=keepcache=True
     - --nogpgcheck
diff --git a/tests/ng/katsu-iso.yaml b/tests/ng/katsu-iso.yaml
index ca8e7ed..20c19c8 100644
--- a/tests/ng/katsu-iso.yaml
+++ b/tests/ng/katsu-iso.yaml
@@ -10,7 +10,7 @@ kernel_cmdline: "quiet rhgb"
 bootloader: grub
 
 dnf:
-  releasever: 39
+  releasever: 40
   options:
     - --setopt=keepcache=True
     - --nogpgcheck
diff --git a/tests/ng/katsu-script-test.yaml b/tests/ng/katsu-script-test.yaml
index ed472e5..55b357e 100644
--- a/tests/ng/katsu-script-test.yaml
+++ b/tests/ng/katsu-script-test.yaml
@@ -7,6 +7,6 @@ dnf:
   options:
     - --nogpgcheck
   repodir: modules/repodir/
-  releasever: 39
+  releasever: 40
   packages:
     - busybox
diff --git a/tests/ng/katsu.yaml b/tests/ng/katsu.yaml
index db3c402..12d9522 100644
--- a/tests/ng/katsu.yaml
+++ b/tests/ng/katsu.yaml
@@ -34,5 +34,5 @@ disk:
       filesystem: ext4
       mountpoint: /
 dnf:
-  dnf5: true
+  exec: dnf5
   releasever: 39
diff --git a/tests/ng/modules/base.yaml b/tests/ng/modules/base.yaml
index 93bad70..41a1caa 100644
--- a/tests/ng/modules/base.yaml
+++ b/tests/ng/modules/base.yaml
@@ -30,6 +30,8 @@ dnf:
     - --setopt=cachedir=/var/cache/dnf
     - --nogpgcheck
     - --setopt=keepcache=True
+    - --setopt=tsflags=
+    - --setopt=max_parallel_downloads=20
   exclude:
     - fedora-release*
     - generic-release*