diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 81ce68ccd9..8b9b7c72e7 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -56,8 +56,10 @@ BuildPackages=
 Packages=
         gdb
         libidn2
+        nano
         qrencode
         strace
+        vi
 
 [Host]
 QemuHeadless=yes
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 69640fa81b..7da81298a2 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -73,7 +73,9 @@ Packages=
         # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
         libtss2-dev
         locales
+        nano
         strace
+        vim-tiny
 
 [Host]
 QemuHeadless=yes
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 680e6fb6a4..f383e11c65 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -77,10 +77,12 @@ Packages=
         # libfido2 + libzstd can be dropped once the Fedora RPM gets a dependency on them
         libfido2
         libzstd
+        nano
         # procps-ng provides a set of useful utilies (ps, free, etc)
         procps-ng
         strace
         tpm2-tss
+        vi
 
 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache
diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index 0dcd0c436d..5d75eecddc 100644
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -76,8 +76,10 @@ Packages=
         libqrencode4
         libseccomp2
         pam
+        nano
         strace
         util-linux
+        vi
 
 [Host]
 QemuHeadless=yes
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 1c22ee04ab..09afafb9db 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -76,7 +76,9 @@ Packages=
         # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
         libtss2-dev
         locales
+        nano
         strace
+        vim-tiny
 
 [Host]
 QemuHeadless=yes