diff --git a/Makefile.inputs b/Makefile.inputs
index ad4f333..c425bea 100644
--- a/Makefile.inputs
+++ b/Makefile.inputs
@@ -1,24 +1,24 @@
 # Configuration vars
 ## Formatting = UPPERCASE
 # General
-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 :,\:,$(wildcard /etc/yum.repos.d/*.repo))
-export ROOTFS_SIZE             := 4
-export VARIANT                 := Server
-export VERSION                 := 39
-export WEB_UI                  := false
+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 :,\:,$(wildcard /etc/yum.repos.d/*.repo))
+export ROOTFS_SIZE             = 4
+export VARIANT                 = Server
+export VERSION                 = 39
+export WEB_UI                  = false
 # Flatpak
-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             :=
+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
-export ENROLLMENT_PASSWORD     :=
-export SECURE_BOOT_KEY_URL     :=
-export ISO_NAME                := build/deploy.iso
\ No newline at end of file
+export ENROLLMENT_PASSWORD     =
+export SECURE_BOOT_KEY_URL     =
+export ISO_NAME                = build/deploy.iso
\ No newline at end of file
diff --git a/test/iso/Makefile b/test/iso/Makefile
index 95e0496..ec99e88 100644
--- a/test/iso/Makefile
+++ b/test/iso/Makefile
@@ -20,6 +20,6 @@ clean:
 	sudo rmdir /mnt/install /mnt/iso
 
 install-deps:
-	$(install_pkg) isomd5sum coreutils squashfs-tools
+	$(install_pkg) isomd5sum coreutils squashfs-tools curl
 
 .PHONY: all $(ISO_TESTS) clean
\ No newline at end of file
diff --git a/test/vm/Makefile b/test/vm/Makefile
index 6dfcd28..bd7e31f 100644
--- a/test/vm/Makefile
+++ b/test/vm/Makefile
@@ -48,7 +48,7 @@ ansible_inventory:
 .PHONY: $(VM_TESTS) install-deps
 
 install-deps:
-	$(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible
+	$(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible curl
 
 files/mnt/iso:
 	$(if $(wildcard files/mnt),,mkdir files/mnt)
diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh
index cac7882..1fdae36 100644
--- a/xorriso/gen_input.sh
+++ b/xorriso/gen_input.sh
@@ -6,17 +6,17 @@ echo "-outdev ${ISO_NAME}"
 echo "-boot_image any replay"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
-pushd ${_BASE_DIR}/results > /dev/null
-for file in $(find * -type f)
-do
-    if [[ "$file" == "images/boot.iso" ]]
-    then
-        continue
-    fi
-    echo "-map ${_BASE_DIR}/results/${file} ${file}"
-    echo "-chmod 0444 ${file}"
-done
-popd > /dev/null
+#pushd ${_BASE_DIR}/results > /dev/null
+#for file in $(find * -type f)
+#do
+#    if [[ "$file" == "images/boot.iso" ]]
+#    then
+#        continue
+#    fi
+#    echo "-map ${_BASE_DIR}/results/${file} ${file}"
+#    echo "-chmod 0444 ${file}"
+#done
+#popd > /dev/null
 
 if [[ -n "${FLATPAK_DIR}" ]]
 then