diff --git a/.gitignore b/.gitignore
index 376bdbd5..ac857062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,7 @@ requirements.txt
 /cmd_output.txt
 node_modules/
 uv.lock
+test_tooling/mkosi/*image*
+test_tooling/mkosi/mkosi.cache/**
+test_tooling/mkosi/mkosi.tools/**
+test_tooling/mkosi/mkosi.tools.manifest
diff --git a/test_tooling/mkosi/mkosi.cache/.gitkeep b/test_tooling/mkosi/mkosi.cache/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/test_tooling/mkosi/mkosi.conf b/test_tooling/mkosi/mkosi.conf
index 814652fc..fdc36613 100644
--- a/test_tooling/mkosi/mkosi.conf
+++ b/test_tooling/mkosi/mkosi.conf
@@ -42,6 +42,7 @@ Profiles=archinstall
 Incremental=true
 ToolsTree=default
 ToolsTreeProfiles=devel,misc,package-manager,runtime,gui
+WithNetwork=yes
 
 [Runtime]
 Console=gui
diff --git a/test_tooling/mkosi/mkosi.extra/root/.profile b/test_tooling/mkosi/mkosi.extra/root/.profile
new file mode 100644
index 00000000..c8d1791b
--- /dev/null
+++ b/test_tooling/mkosi/mkosi.extra/root/.profile
@@ -0,0 +1,5 @@
+cd archinstall-git
+rm -rf dist
+
+uv build --no-build-isolation --wheel
+uv pip install dist/*.whl --break-system-packages --system --no-build --no-deps
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.postinst.chroot b/test_tooling/mkosi/mkosi.postinst.chroot
old mode 100644
new mode 100755
index 88809b6a..c49c7a7f
--- a/test_tooling/mkosi/mkosi.postinst.chroot
+++ b/test_tooling/mkosi/mkosi.postinst.chroot
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 
-git clone https://github.com/archlinux/archinstall.git /root/archinstall
\ No newline at end of file
+git clone https://github.com/archlinux/archinstall.git /root/archinstall-git
+curl -s "https://archlinux.org/mirrorlist/?country=SE&protocol=https&use_mirror_status=on" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 5 - > /etc/pacman.d/mirrorlist
+
+# TODO: Set geo-mirrors statically instead
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.profiles/archinstall b/test_tooling/mkosi/mkosi.profiles/archinstall
index 644fe388..055e000f 100644
--- a/test_tooling/mkosi/mkosi.profiles/archinstall
+++ b/test_tooling/mkosi/mkosi.profiles/archinstall
@@ -38,6 +38,16 @@ Packages=
 	strace
 	util-linux
 	xz
+	pacman-contrib
+	gcc
 	git
+	pkgconfig
+	python
+	python-pip
+	python-uv
+	python-setuptools
+	python-pyparted
+	python-pydantic
+	python-textual
 WithDocs=false
 KernelCommandLine=quiet splash
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.version b/test_tooling/mkosi/mkosi.version
new file mode 100644
index 00000000..62f94575
--- /dev/null
+++ b/test_tooling/mkosi/mkosi.version
@@ -0,0 +1 @@
+6
\ No newline at end of file