diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index c990a6acf0..32dab1a7f3 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -111,8 +111,6 @@ jobs:
 
         [Content]
         Environment=
-                # mkfs.erofs is extremely noisy when not connected to a tty.
-                SYSTEMD_REPART_MKFS_OPTIONS_EROFS="--quiet"
                 # Build debuginfo packages since we'll be publishing the packages as artifacts.
                 WITH_DEBUG=1
                 # Enabling optimizations significantly speeds up integration tests.
@@ -121,21 +119,10 @@ jobs:
         [Host]
         ToolsTree=default
         ToolsTreeDistribution=fedora
-        # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
-        QemuFirmware=uefi
         # We build with debuginfo so there's no point in mounting the sources into the machine.
         RuntimeBuildSources=no
         EOF
 
-        # These should override the options from mkosi.conf so we put them in a dropin that's ordered later
-        # instead.
-        tee mkosi.conf.d/99-ci.conf <<EOF
-        [Host]
-        KernelCommandLineExtra=
-                # Root device can take a long time to appear, so let's bump the timeout.
-                systemd.default_device_timeout_sec=180
-        EOF
-
     - name: Generate secure boot key
       run: mkosi --debug genkey
 
diff --git a/mkosi.conf b/mkosi.conf
index 2da8804a7e..45102ac7af 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -29,7 +29,7 @@ KernelCommandLine=systemd.crash_shell
                   rw
                   # Lower the default device timeout so we get a shell earlier if the root device does
                   # not appear for some reason.
-                  systemd.default_device_timeout_sec=20
+                  systemd.default_device_timeout_sec=30
                   # Make sure no LSMs are enabled by default.
                   apparmor=0
                   selinux=0