diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index be442a3..efcf873 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -86,11 +86,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: ${{ inputs[format('iso_name-{0}', matrix.version)] }}
-    
-      - name: Verify ISO
-        run: |
-          checkisomd5 ${{ inputs[format('iso_name-{0}', matrix.version)] }}
-          sha256sum -c ${{ inputs[format('iso_name-{0}', matrix.version)] }}-CHECKSUM
 
       - name: Run ISO checks
         run: |
diff --git a/.gitignore b/.gitignore
index f116d91..642219d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,9 @@
 /build
 /lorax_templates/post_*
 /pkglists
-/repos
+/repos/*.repo
 /results
 /xorriso/input.txt
-/xorriso/*.sh
 /original-pkgsizes.txt
 /final-pkgsizes.txt
 /lorax.conf
diff --git a/Makefile b/Makefile
index b596037..83ab500 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,33 @@
 # Configuration vars
 ## Formatting = UPPERCASE
 # General
-ADDITIONAL_TEMPLATES =
-ARCH = x86_64
-EXTRA_BOOT_PARAMS =
-IMAGE_NAME = base
-IMAGE_REPO = quay.io/fedora-ostree-desktops
-IMAGE_TAG = $(VERSION)
+export ADDITIONAL_TEMPLATES =
+export ARCH = x86_64
+export EXTRA_BOOT_PARAMS =
+export IMAGE_NAME = base
+export IMAGE_REPO = quay.io/fedora-ostree-desktops
+export IMAGE_TAG = $(VERSION)
 REPOS = $(subst :,\:,$(shell ls /etc/yum.repos.d/*.repo))
-ROOTFS_SIZE = 4
-VARIANT = Server
-VERSION = 39
-WEB_UI = false
+export ROOTFS_SIZE = 4
+export VARIANT = Server
+export VERSION = 39
+export WEB_UI = false
 # Flatpak
-FLATPAK_REMOTE_NAME = flathub
-FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo
-FLATPAK_REMOTE_REFS =
-FLATPAK_REMOTE_REFS_DIR =
-FLATPAK_DIR =
+export FLATPAK_REMOTE_NAME = flathub
+export FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo
+export FLATPAK_REMOTE_REFS =
+export FLATPAK_REMOTE_REFS_DIR =
+export FLATPAK_DIR =
 # Secure boot
-ENROLLMENT_PASSWORD =
-SECURE_BOOT_KEY_URL =
+export ENROLLMENT_PASSWORD =
+export SECURE_BOOT_KEY_URL =
 
 ###################
 # Hidden vars
 
 # Cache
-DNF_CACHE = 
-PACKAGE_MANAGER = dnf
+export DNF_CACHE = 
+export PACKAGE_MANAGER = dnf
 
 # Functions
 ## Formatting = lowercase
@@ -36,56 +36,6 @@ PACKAGE_MANAGER = dnf
 get_templates = $(shell ls lorax_templates/$(1)_*.tmpl) \
                 $(foreach file,$(notdir $(shell ls lorax_templates/scripts/post/$(1)_*)),lorax_templates/post_$(file).tmpl)
 
-# Get a list of tests for the feature
-# $1 = test type
-# $2 = feature
-run_tests = tests="$(shell ls tests/$(1)/$(2)_*)"; \
-			if [ -n "$$tests" ]; \
-			then \
-			  chmod +x $$tests; \
-	  		  for test in $$tests; \
-	  		  do \
-				$(foreach var,$(_VARS),$(var)=$($(var))) ./$${test}; \
-				RC=$$?; if [ $$RC != 0 ]; then exit $$RC; fi; \
-	  		  done; \
-			fi
-
-# Converts a post script to a template
-# $1 = script to convert
-# $2 = file on ISO to write
-# $3 = whether to copy the '<%' lines to the template
-convert_post_to_tmpl = header=0; \
-	skip=0; \
-	while read -r line; \
-	do \
-		if [[ $$line =~ ^\<\% ]]; \
-		then \
-			if [[ '$(3)' == 'true' ]]; \
-			then \
-				echo $$line >> lorax_templates/post_$(1).tmpl; \
-			fi; \
-			echo >> lorax_templates/post_$(1).tmpl; \
-		else \
-			if [[ $$header == 0 ]]; \
-			then \
-				if [[ $$line =~ ^\#\#\ (.*)$$ ]]; \
-				then \
-					echo "append $(2) \"%post --erroronfail $${BASH_REMATCH[1]}\"" >> lorax_templates/post_$(1).tmpl; \
-					skip=1; \
-				else \
-					echo "append $(2) \"%post --erroronfail\"" >> lorax_templates/post_$(1).tmpl; \
-				fi; \
-				header=1; \
-			fi; \
-			if [[ $$skip == 0 ]]; \
-			then \
-				echo "append $(2) \"$${line//\"/\\\"}\"" >> lorax_templates/post_$(1).tmpl; \
-			fi; \
-			skip=0; \
-		fi; \
-	done < lorax_templates/scripts/post/$(1); \
-	echo "append $(2) \"%end\"" >> lorax_templates/post_$(1).tmpl
-
 # Generated/internal vars
 ## Formatting = _UPPERCASE
 _BASE_DIR = $(shell pwd)
@@ -150,6 +100,8 @@ _LORAX_TEMPLATES += $(call get_templates,secureboot)
 _TEMPLATE_VARS   += ENROLLMENT_PASSWORD
 endif
 
+_SUBDIRS = container external flatpak_refs lorax_templates repos xorriso
+
 # Step 7: Build end ISO
 ## Default action
 build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
@@ -157,24 +109,6 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.tx
 	xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
 	implantisomd5 build/deploy.iso
 
-external/lorax/branch-$(VERSION):
-	git config advice.detachedHead false
-	cd external/lorax && git reset --hard HEAD && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
-	touch external/lorax/branch-$(VERSION)
-
-# Step 1: Generate Lorax Templates
-lorax_templates/post_%.tmpl: lorax_templates/scripts/post/%
-	$(call convert_post_to_tmpl,$*,usr/share/anaconda/post-scripts/$*.ks,true)
-
-repos: $(_REPO_FILES)
-
-# Step 2: Replace vars in repo files
-repos/%.repo: /etc/yum.repos.d/%.repo
-	mkdir repos || true
-	cp /etc/yum.repos.d/$*.repo           $(_BASE_DIR)/repos/$*.repo
-	sed -i "s/\$$releasever/${VERSION}/g" $(_BASE_DIR)/repos/$*.repo
-	sed -i "s/\$$basearch/${ARCH}/g"      $(_BASE_DIR)/repos/$*.repo
-
 # Step 3: Build boot.iso using Lorax
 boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
 	rm -Rf $(_BASE_DIR)/results || true
@@ -200,90 +134,29 @@ boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_T
 	mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
 	mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true
 
-# Step 4: Download container image
-container/$(IMAGE_NAME)-$(IMAGE_TAG):
-	mkdir $(_BASE_DIR)/container || true
-	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(_BASE_DIR)/container/$(IMAGE_NAME)-$(IMAGE_TAG)
-
-# Step 5: Generate xorriso script
-xorriso/%.sh: xorriso/%.sh.in
-	sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg
-	sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg
-	$(eval _VARS = FLATPAK_DIR IMAGE_NAME IMAGE_TAG ARCH VERSION)
-	$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/xorriso/$*.sh.in > $(_BASE_DIR)/xorriso/$*.sh 
-
-# Step 6: Generate xorriso input
-xorriso/input.txt: xorriso/gen_input.sh
-	bash $(_BASE_DIR)/xorriso/gen_input.sh | tee $(_BASE_DIR)/xorriso/input.txt
-
 
+FILES_TO_CLEAN = $(wildcard build debugdata pkglists results original-pkgsizes.txt final-pkgsizes.txt lorax.conf *.iso *log)
 clean:
-	rm -Rf $(_BASE_DIR)/build || true
-	rm -Rf $(_BASE_DIR)/container || true
-	rm -Rf $(_BASE_DIR)/debugdata || true
-	rm -Rf $(_BASE_DIR)/pkglists || true
-	rm -Rf $(_BASE_DIR)/repos || true
-	rm -Rf $(_BASE_DIR)/results || true
-	rm -f $(_BASE_DIR)/lorax_templates/*.tmpl || true
-	rm -f $(_BASE_DIR)/xorriso/input.txt || true
-	rm -f $(_BASE_DIR)/xorriso/*.sh || true
-	rm -f $(_BASE_DIR)/{original,final}-pkgsizes.txt || true
-	rm -f $(_BASE_DIR)/lorax.conf || true
-	rm -f $(_BASE_DIR)/*.iso || true
-	rm -f $(_BASE_DIR)/*.log || true
+	rm -Rf $(FILES_TO_CLEAN)
+	$(foreach DIR,$(_SUBDIRS),$(MAKE) -C $(DIR) clean;)
 
 install-deps:
 	if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi
-	$(PACKAGE_MANAGER) install -y lorax xorriso skopeo flatpak dbus-daemon ostree coreutils gettext git
-
-install-test-deps:
-	if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi
-	$(PACKAGE_MANAGER) install -y qemu qemu-utils xorriso unzip qemu-system-x86 netcat socat jq isomd5sum ansible make coreutils squashfs-tools
-
-
-test: test-iso test-vm
-
-test-repo:
-	bash tests/repo/vars.sh
-
-test-iso:
-	$(eval _VARS = VERSION FLATPAK_REMOTE_NAME _FLATPAK_REPO_URL)
-
-	sudo modprobe loop
-	sudo mkdir /mnt/iso /mnt/install
-	sudo mount -o loop deploy.iso /mnt/iso
-	sudo mount -t squashfs -o loop /mnt/iso/images/install.img /mnt/install
-
-	# install tests
-	$(call run_tests,iso,install)
-	
-	# flapak tests
-	if [ -n "$(FLATPAK_REMOTE_REFS)" ]; then $(call run_tests,iso,flatpak); fi
-
-	# Cleanup
-	sudo umount /mnt/install
-	sudo umount /mnt/iso
-
-ansible_inventory: 
-	echo "ungrouped:" > ansible_inventory
-	echo "  hosts:" >> ansible_inventory
-	echo "    vm:" >> ansible_inventory
-	echo "      ansible_host: ${VM_IP}" >> ansible_inventory
-	echo "      ansible_port: ${VM_PORT}" >> ansible_inventory
-	echo "      ansible_user: ${VM_USER}" >> ansible_inventory
-	echo "      ansible_password: ${VM_PASS}" >> ansible_inventory
-	echo "      ansible_become_pass: ${VM_PASS}" >> ansible_inventory
-	echo "      ansible_ssh_common_args: '-o StrictHostKeyChecking=no'" >> ansible_inventory
+	$(PACKAGE_MANAGER) install -y lorax xorriso coreutils gettext 
+	$(foreach DIR,$(_SUBDIRS),$(MAKE) -C $(DIR) install-deps;)
 
 test-vm: ansible_inventory
-	$(eval _VARS = IMAGE_REPO IMAGE_NAME IMAGE_TAG)
+	
 
-	ansible -i ansible_inventory -m ansible.builtin.wait_for_connection vm
+_SUBMAKES = $(_SUBDIRS) test $(filter-out README.md Makefile,$(wildcard test/*)) $(filter-out README.md Makefile,$(wildcard test/*/*))
+$(_SUBMAKES):
+	$(eval DIR=$(firstword $(subst /, ,$@)))
+	$(eval TARGET=$(subst $(DIR)/,,$@))
+	$(MAKE) -w -C $(DIR) $(TARGET)
 
-	# install tests
-	$(call run_tests,vm,install)
+$(addsuffix /%,$(_SUBMAKES)):
+	$(eval DIR=$(firstword $(subst /, ,$@)))
+	$(eval TARGET=$(subst $(DIR)/,,$@))
+	$(MAKE) -w -C $(DIR) $(TARGET)
 
-	# flapak tests
-	if [ -n "$(FLATPAK_REMOTE_REFS)" ]; then $(call run_tests,vm,flatpak); fi
-
-.PHONY: clean install-deps install-test-deps test test-iso test-vm
+.PHONY: clean install-deps $(_SUBMAKES) test
diff --git a/container/Makefile b/container/Makefile
new file mode 100644
index 0000000..2f69caf
--- /dev/null
+++ b/container/Makefile
@@ -0,0 +1,13 @@
+container/$(IMAGE_NAME)-$(IMAGE_TAG):
+	mkdir $(_BASE_DIR)/container || true
+	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(_BASE_DIR)/container/$(IMAGE_NAME)-$(IMAGE_TAG)
+
+install-deps:
+	if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi
+	$(PACKAGE_MANAGER) install -y skopeo
+
+FILES=$(filter-out Makefile,$(wildcard *))
+clean:
+ifneq ($(FILES),)
+	rm -Rf $(FILES)
+endif
\ No newline at end of file
diff --git a/external/Makefile b/external/Makefile
new file mode 100644
index 0000000..6bb8cb2
--- /dev/null
+++ b/external/Makefile
@@ -0,0 +1,13 @@
+lorax/branch-$(VERSION):
+	git config advice.detachedHead false
+	cd lorax && git reset --hard HEAD && git checkout tags/$(shell cd lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
+	touch lorax/branch-$(VERSION)
+
+install-deps:
+	if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi
+	# Used by external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
+	$(PACKAGE_MANAGER) install -y flatpak dbus-daemon ostree
+	# Used to clone proper lorax branch
+	$(PACKAGE_MANAGER) install -y git
+
+clean:
\ No newline at end of file
diff --git a/flatpak_refs/Makefile b/flatpak_refs/Makefile
new file mode 100644
index 0000000..e08333e
--- /dev/null
+++ b/flatpak_refs/Makefile
@@ -0,0 +1,3 @@
+install-deps:
+
+clean:
\ No newline at end of file
diff --git a/lorax_templates/Makefile b/lorax_templates/Makefile
new file mode 100644
index 0000000..ca0e4b7
--- /dev/null
+++ b/lorax_templates/Makefile
@@ -0,0 +1,47 @@
+# Converts a post script to a template
+# $1 = script to convert
+# $2 = file on ISO to write
+# $3 = whether to copy the '<%' lines to the template
+convert_post_to_tmpl = header=0; \
+	skip=0; \
+	while read -r line; \
+	do \
+		if [[ $$line =~ ^\<\% ]]; \
+		then \
+			if [[ '$(3)' == 'true' ]]; \
+			then \
+				echo $$line >> post_$(1).tmpl; \
+			fi; \
+			echo >> post_$(1).tmpl; \
+		else \
+			if [[ $$header == 0 ]]; \
+			then \
+				if [[ $$line =~ ^\#\#\ (.*)$$ ]]; \
+				then \
+					echo "append $(2) \"%post --erroronfail $${BASH_REMATCH[1]}\"" >> post_$(1).tmpl; \
+					skip=1; \
+				else \
+					echo "append $(2) \"%post --erroronfail\"" >> post_$(1).tmpl; \
+				fi; \
+				header=1; \
+			fi; \
+			if [[ $$skip == 0 ]]; \
+			then \
+				echo "append $(2) \"$${line//\"/\\\"}\"" >> post_$(1).tmpl; \
+			fi; \
+			skip=0; \
+		fi; \
+	done < scripts/post/$(1); \
+	echo "append $(2) \"%end\"" >> post_$(1).tmpl
+
+
+post_%.tmpl: scripts/post/%
+	$(call convert_post_to_tmpl,$*,usr/share/anaconda/post-scripts/$*.ks,true)
+
+install-deps:
+
+FILES=$(wildcard post_*)
+clean:
+ifneq ($(FILES),)
+	rm -Rf $(FILES)
+endif
\ No newline at end of file
diff --git a/repos/Makefile b/repos/Makefile
new file mode 100644
index 0000000..80aedd7
--- /dev/null
+++ b/repos/Makefile
@@ -0,0 +1,16 @@
+repos: $(_REPO_FILES)
+
+# Step 2: Replace vars in repo files
+repos/%.repo: /etc/yum.repos.d/%.repo
+	mkdir repos || true
+	cp /etc/yum.repos.d/$*.repo           $(_BASE_DIR)/repos/$*.repo
+	sed -i "s/\$$releasever/${VERSION}/g" $(_BASE_DIR)/repos/$*.repo
+	sed -i "s/\$$basearch/${ARCH}/g"      $(_BASE_DIR)/repos/$*.repo
+
+install-deps:
+
+FILES=$(wildcard *.repo)
+clean:
+ifneq ($(FILES),)
+	rm -Rf $(FILES)
+endif
\ No newline at end of file
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..58eedb9
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,14 @@
+TESTS=$(filter-out README.md Makefile,$(wildcard *)) $(filter-out README.md Makefile,$(wildcard */*))
+
+all: $(TESTS)
+
+$(TESTS):
+	$(eval DIR=$(firstword $(subst /, ,$@)))
+	$(eval TARGET=$(subst $(DIR)/,,$@))
+	$(MAKE) -w -C $(DIR) $(TARGET)
+
+install-deps:
+	if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi
+	$(PACKAGE_MANAGER) install -y qemu qemu-utils xorriso unzip qemu-system-x86 netcat socat jq isomd5sum ansible make coreutils squashfs-tools
+
+.PHONY: all $(TESTS)
\ No newline at end of file
diff --git a/test/iso/Makefile b/test/iso/Makefile
new file mode 100644
index 0000000..1af6a5e
--- /dev/null
+++ b/test/iso/Makefile
@@ -0,0 +1,28 @@
+ISO_NAME=deploy.iso
+ISO_TESTS=$(filter-out README.md Makefile,$(wildcard *)))
+
+all: $(ISO_TESTS)
+
+$(ISO_TESTS):
+	chmod +x $@
+	ISO=../../$(ISO_NAME) ./$@
+
+prep:
+	$(eval _VARS = VERSION FLATPAK_REMOTE_NAME _FLATPAK_REPO_URL)
+
+	sudo modprobe loop
+	sudo mkdir /mnt/iso /mnt/install
+	sudo mount -o loop deploy.iso /mnt/iso
+	sudo mount -t squashfs -o loop /mnt/iso/images/install.img /mnt/install
+
+	# install tests
+	$(call run_tests,iso,install)
+	
+	# flapak tests
+	if [ -n "$(FLATPAK_REMOTE_REFS)" ]; then $(call run_tests,iso,flatpak); fi
+
+	# Cleanup
+	sudo umount /mnt/install
+	sudo umount /mnt/iso
+
+.PHONY: all $(ISO_TESTS)
\ No newline at end of file
diff --git a/tests/iso/README.md b/test/iso/README.md
similarity index 100%
rename from tests/iso/README.md
rename to test/iso/README.md
diff --git a/tests/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
similarity index 100%
rename from tests/iso/flatpak_repo_updated.sh
rename to test/iso/flatpak_repo_updated.sh
diff --git a/test/iso/install_hash.sh b/test/iso/install_hash.sh
new file mode 100644
index 0000000..4d62147
--- /dev/null
+++ b/test/iso/install_hash.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+checkisomd5 ${ISO}
+cd $(dirname ${ISO}) && sha256sum -c $(basename ${ISO})-CHECKSUM
\ No newline at end of file
diff --git a/tests/iso/install_os-release.sh b/test/iso/install_os-release.sh
similarity index 100%
rename from tests/iso/install_os-release.sh
rename to test/iso/install_os-release.sh
diff --git a/test/repo/Makefile b/test/repo/Makefile
new file mode 100644
index 0000000..f8fcb66
--- /dev/null
+++ b/test/repo/Makefile
@@ -0,0 +1,9 @@
+REPO_TESTS=$(filter-out README.md Makefile,$(shell ls))
+
+all: $(REPO_TESTS)
+
+$(REPO_TESTS):
+	chmod +x $*
+	./$*
+
+.PHONY: $(REPO_TESTS)
\ No newline at end of file
diff --git a/tests/repo/vars.sh b/test/repo/vars.sh
similarity index 96%
rename from tests/repo/vars.sh
rename to test/repo/vars.sh
index 2e4302e..bc80d46 100644
--- a/tests/repo/vars.sh
+++ b/test/repo/vars.sh
@@ -12,7 +12,7 @@ do
     then
         break
     fi
-done < Makefile
+done < ../../Makefile
 
 result=0
 
diff --git a/test/vm/Makefile b/test/vm/Makefile
new file mode 100644
index 0000000..bec6b72
--- /dev/null
+++ b/test/vm/Makefile
@@ -0,0 +1,47 @@
+VM_TESTS=$(filter-out README.md,$(shell ls))
+
+# Get a list of tests for the feature
+# $1 = test type
+# $2 = feature
+run_tests = \
+	tests="$(shell ls tests/$(1)/$(2)_*)"; \
+	if [ -n "$$tests" ]; \
+	then \
+		chmod +x $$tests; \
+		for test in $$tests; \
+		do \
+			$(foreach var,$(_VARS),$(var)=$($(var))) ./$${test}; \
+			RC=$$?; \
+			if [ $$RC != 0 ]; \
+			then \
+				exit $$RC; \
+			fi; \
+		done; \
+	fi
+
+$(VM_TESTS):
+	$(eval _VARS = IMAGE_REPO IMAGE_NAME IMAGE_TAG)
+
+	ansible -i ansible_inventory -m ansible.builtin.wait_for_connection vm
+
+	# install tests
+	$(call run_tests,vm,install)
+
+	# flapak tests
+	if [ -n "$(FLATPAK_REMOTE_REFS)" ]; \
+	then \
+		$(call run_tests,vm,flatpak); \
+	fi
+
+ansible_inventory: 
+	echo "ungrouped:" > ansible_inventory
+	echo "  hosts:" >> ansible_inventory
+	echo "    vm:" >> ansible_inventory
+	echo "      ansible_host: ${VM_IP}" >> ansible_inventory
+	echo "      ansible_port: ${VM_PORT}" >> ansible_inventory
+	echo "      ansible_user: ${VM_USER}" >> ansible_inventory
+	echo "      ansible_password: ${VM_PASS}" >> ansible_inventory
+	echo "      ansible_become_pass: ${VM_PASS}" >> ansible_inventory
+	echo "      ansible_ssh_common_args: '-o StrictHostKeyChecking=no'" >> ansible_inventory
+
+.PHONY: $(VM_TESTS)
\ No newline at end of file
diff --git a/tests/vm/README.md b/test/vm/README.md
similarity index 100%
rename from tests/vm/README.md
rename to test/vm/README.md
diff --git a/tests/vm/flatpak_fedora_repo_disabled.yml b/test/vm/flatpak_fedora_repo_disabled.yml
similarity index 100%
rename from tests/vm/flatpak_fedora_repo_disabled.yml
rename to test/vm/flatpak_fedora_repo_disabled.yml
diff --git a/tests/vm/flatpak_installed.yml b/test/vm/flatpak_installed.yml
similarity index 100%
rename from tests/vm/flatpak_installed.yml
rename to test/vm/flatpak_installed.yml
diff --git a/tests/vm/flatpak_update.yml b/test/vm/flatpak_update.yml
similarity index 100%
rename from tests/vm/flatpak_update.yml
rename to test/vm/flatpak_update.yml
diff --git a/tests/vm/install_image_source.yml b/test/vm/install_image_source.yml
similarity index 100%
rename from tests/vm/install_image_source.yml
rename to test/vm/install_image_source.yml
diff --git a/xorriso/Makefile b/xorriso/Makefile
new file mode 100644
index 0000000..8530e04
--- /dev/null
+++ b/xorriso/Makefile
@@ -0,0 +1,13 @@
+xorriso/input.txt: xorriso/gen_input.sh
+	sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg
+	sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg
+	$(eval _VARS = FLATPAK_DIR IMAGE_NAME IMAGE_TAG ARCH VERSION)
+	$(foreach var,$(_VARS),$(var)=$($(var))) bash $(_BASE_DIR)/xorriso/gen_input.sh | tee $(_BASE_DIR)/xorriso/input.txt
+
+install-deps:
+
+FILES=$(wildcard input.txt)
+clean:
+ifneq ($(FILES),)
+	rm -Rf $(FILES)
+endif
\ No newline at end of file
diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh
similarity index 96%
rename from xorriso/gen_input.sh.in
rename to xorriso/gen_input.sh
index 0a993bc..2646b6c 100644
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+echo "-report_about WARNING"
 echo "-indev $(pwd)/boot.iso"
 echo "-outdev $(pwd)/build/deploy.iso"
 echo "-boot_image any replay"