diff --git a/builder/core/iso_generator.py b/builder/core/iso_generator.py
index 33b3d76e..030c9f83 100644
--- a/builder/core/iso_generator.py
+++ b/builder/core/iso_generator.py
@@ -99,10 +99,7 @@ def iso_generator_main(
 # Generate ISO using xorriso
     logging.info("=> Generating ISO image with xorriso...")
     xorriso_command = [
-        "xbps-uchroot",
-        paths['PEPHOSTDIR'],
-        "/usr/bin/xorriso",
-        "--",
+        os.path.join(paths['PEPHOSTDIR'], "usr/bin/xorriso"),
         "-as", "mkisofs",
         "-iso-level", "3",
         "-rock",
diff --git a/builder/core/squashfs.py b/builder/core/squashfs.py
index f6f0368e..93abe4e0 100644
--- a/builder/core/squashfs.py
+++ b/builder/core/squashfs.py
@@ -96,11 +96,9 @@ def create_squashfs_image(rootfs_dir, squashfs_output_file, pep_host_dir, logger
 
         output_dir = os.path.dirname(squashfs_output_file)
         os.makedirs(output_dir, exist_ok=True)
+        mksquashfs_path = os.path.join(pep_host_dir, "usr", "bin", "mksquashfs")
         mksquashfs_command = [
-            "xbps-uchroot",
-            pep_host_dir,
-            "/usr/bin/mksquashfs",
-            "--",
+            mksquashfs_path,
             os.path.join(build_dir, "tmp"),
             squashfs_output_file,
             "-comp", "zstd",