diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 9782a7d872..8bc39d7b60 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -52,4 +52,3 @@ Packages=
         nano
         qrencode
         strace
-        vi
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 0d37937aea..9bd504bf57 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -68,4 +68,3 @@ Packages=
         locales
         nano
         strace
-        vim-tiny
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 540c85c026..cc3a5a2d1a 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -9,13 +9,8 @@ Release=34
 
 [Packages]
 BuildPackages=
-        audit-libs-devel
-        bzip2-devel
-        cryptsetup-devel
-        dbus-devel
         diffutils
         docbook-style-xsl
-        elfutils-devel
         findutils
         gcc
         gettext
@@ -23,45 +18,51 @@ BuildPackages=
         glibc-minimal-langpack
         gnu-efi
         gnu-efi-devel
-        gnutls-devel
         gperf
-        iptables-devel
-        kmod-devel
-        libacl-devel
-        libblkid-devel
-        libcap-devel
-        libcurl-devel
-        libfdisk-devel
-        libfido2-devel
-        libgcrypt-devel
-        libidn2-devel
-        libmicrohttpd-devel
-        libmount-devel
-        libpwquality-devel
-        libseccomp-devel
-        libselinux-devel
-        libxkbcommon-devel
-        libxslt
-        libzstd-devel
         lz4
-        lz4-devel
         meson
         ninja-build
-        openssl-devel
-        p11-kit-devel
         pam-devel
-        pcre2-devel
         pkgconfig
-        python3-devel
-        python3-lxml
+        pkgconfig(audit)
+        pkgconfig(blkid)
+        pkgconfig(bzip2)
+        pkgconfig(dbus-1)
+        pkgconfig(fdisk)
+        pkgconfig(gnutls)
+        pkgconfig(libacl)
+        pkgconfig(libcap)
+        pkgconfig(libcryptsetup)
+        pkgconfig(libcurl)
+        pkgconfig(libdw)
+        pkgconfig(libfido2)
+        pkgconfig(libgcrypt)
+        pkgconfig(libidn2)
+        pkgconfig(libiptc)
+        pkgconfig(libkmod)
+        pkgconfig(liblz4)
+        pkgconfig(liblzma)
+        pkgconfig(libmicrohttpd)
+        pkgconfig(libpcre2-8)
+        pkgconfig(libqrencode)
+        pkgconfig(libseccomp)
+        pkgconfig(libselinux)
+        pkgconfig(libzstd)
+        pkgconfig(mount)
+        pkgconfig(openssl)
+        pkgconfig(p11-kit-1)
+        pkgconfig(pwquality)
+        pkgconfig(tss2-esys)
+        pkgconfig(tss2-mu)
+        pkgconfig(tss2-rc)
+        pkgconfig(valgrind)
+        pkgconfig(xkbcommon)
         python3dist(jinja2)
-        qrencode-devel
+        python3dist(lxml)
         rpm
-        tpm2-tss-devel
         tree
-        valgrind-devel
-        xz-devel
         zstd
+        /usr/bin/xsltproc
 
 Packages=
         gdb
@@ -70,4 +71,3 @@ Packages=
         procps-ng
         strace
         tpm2-tss
-        vi
diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index bf05f8dd72..b468433f34 100644
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -69,4 +69,3 @@ Packages=
         nano
         strace
         util-linux
-        vi
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 32447c8b38..c9c473e7ba 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -71,4 +71,3 @@ Packages=
         locales
         nano
         strace
-        vim-tiny