diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index ff9aa4d..52769bc 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -45,7 +45,6 @@ jobs:
       matrix:
         version:
           - 8
-          - 9
           - 38
           - 39
           - 40
@@ -53,9 +52,6 @@ jobs:
           - version: 8
             image_tag: 39
             rhel: true
-          - version: 9
-            image_tag: 40
-            rhel: true
     outputs:
       iso_name-38: ${{ steps.save_output.outputs.iso_name-38 }}
       iso_name-39: ${{ steps.save_output.outputs.iso_name-39 }}
diff --git a/Makefile b/Makefile
index 142aec2..0c672ea 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,7 @@ container/$(IMAGE_NAME)-$(IMAGE_TAG):
 
 # Step 5: Generate xorriso script
 xorriso/%.sh: xorriso/%.sh.in
-	find results
+	find $(_BASE_DIR)/results
 	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 = IMAGE_NAME IMAGE_TAG ARCH VERSION)