diff --git a/build_iso.sh b/test_tooling/mkarchiso/build_iso.sh
similarity index 100%
rename from build_iso.sh
rename to test_tooling/mkarchiso/build_iso.sh
diff --git a/test_tooling/mkosi/mkosi.conf b/test_tooling/mkosi/mkosi.conf
new file mode 100644
index 00000000..814652fc
--- /dev/null
+++ b/test_tooling/mkosi/mkosi.conf
@@ -0,0 +1,49 @@
+[Distribution]
+Distribution=arch
+# LocalMirror=file:///var/lib/localmirror
+
+[Output]
+Format=uki
+# Format=disk
+
+[Include]
+Include=mkosi-vm
+
+[Validation]
+SecureBoot=false
+SecureBootAutoEnroll=false
+Sign=false
+# Signing artifacts (hashsums etc) using a GPG key:
+# Key=D4B58E897A929F2E
+# Signing secure boot using PIV on yubikey:
+# SecureBoot=true
+# SecureBootKey=pkcs11:
+# SecureBootCertificate=secureboot.crt
+
+[Content]
+Packages=
+         pacman
+         archlinux-keyring
+         amd-ucode
+         intel-ucode
+#         tpm2-tss
+#         libfido2
+#         libp11-kit
+WithDocs=false
+RootPassword=toor
+Timezone=Europe/Stockholm
+Keymap=sv-latin1
+InitrdProfiles=network
+
+[Config]
+Profiles=archinstall
+
+[Build]
+Incremental=true
+ToolsTree=default
+ToolsTreeProfiles=devel,misc,package-manager,runtime,gui
+
+[Runtime]
+Console=gui
+CPUs=4
+RAM=8G
diff --git a/test_tooling/mkosi/mkosi.extra/etc/systemd/system/getty@tty1.service.d/autologin.conf b/test_tooling/mkosi/mkosi.extra/etc/systemd/system/getty@tty1.service.d/autologin.conf
new file mode 100644
index 00000000..161d4952
--- /dev/null
+++ b/test_tooling/mkosi/mkosi.extra/etc/systemd/system/getty@tty1.service.d/autologin.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=-/usr/bin/agetty --noreset --noclear --autologin root - ${TERM}
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.postinst.chroot b/test_tooling/mkosi/mkosi.postinst.chroot
new file mode 100644
index 00000000..88809b6a
--- /dev/null
+++ b/test_tooling/mkosi/mkosi.postinst.chroot
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+git clone https://github.com/archlinux/archinstall.git /root/archinstall
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.profiles/archinstall b/test_tooling/mkosi/mkosi.profiles/archinstall
new file mode 100644
index 00000000..644fe388
--- /dev/null
+++ b/test_tooling/mkosi/mkosi.profiles/archinstall
@@ -0,0 +1,43 @@
+[Content]
+Packages=
+	acpid
+	intel-media-driver
+	linux-firmware
+	linux-firmware-intel
+	ca-certificates-mozilla
+	ca-certificates-utils
+	nano
+	gvfs
+	noto-fonts
+	cantarell-fonts
+	ttf-dejavu
+	polkit
+	bash
+	bzip2
+	coreutils
+	file
+	filesystem
+	findutils
+	gawk
+	gcc-libs
+	gettext
+	glibc
+	grep
+	gzip
+	iproute2
+	iputils
+	licenses
+	pciutils
+	procps-ng
+	psmisc
+	sed
+	tar
+	linux
+	diffutils
+	less
+	strace
+	util-linux
+	xz
+	git
+WithDocs=false
+KernelCommandLine=quiet splash
\ No newline at end of file