diff --git a/Makefile b/Makefile
index 6da144e8..c4962ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ INSTALLERDIR = $(realpath ./installer)
 
 PROJECTDIR		=  $(abspath )
 BUILDDIR_BASE	=  $(abspath ./build)
-IMAGEDIR_BASE	=  $(BUILDDIR)/images
+IMAGEDIR_BASE	=  $(abspath ./images)
 
 OS_RELEASE_VER = 20.04.1
 
@@ -44,6 +44,9 @@ export OS_RELEASE_VER
 .PHONY: all clean $(PROFILE_LIST)
 
 all: $(PROFILE_LIST)
+	mkdir -p $(BUILDDIR_BASE)
+	mkdir -p $(IMAGEDIR_BASE)
+
 	$(Q) echo "=== Building $< $(OS_RELEASE_VER) ==="
 	$(Q) $(MAKE) -f make/Makefile.$< all
 
diff --git a/make/Makefile.9000NPBP01R01 b/make/Makefile.9000NPBP01R01
index a975099e..ef509978 100644
--- a/make/Makefile.9000NPBP01R01
+++ b/make/Makefile.9000NPBP01R01
@@ -47,13 +47,9 @@ sysroot-cleanup:
 sysroot-archive: installer sysroot-ansible sysroot-cleanup
 	tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_SYSROOT_DIR) . | pbzip2 > $(TARGET_INSTALLER_DIR)/$(CHROOT_PKG)
 
-INPUT_DIR=$1
-WORK_DIR=$2
-TARGET_BINARY=$3
-
 sysroot-binary: sysroot-archive 
 	mkdir -p $(TARGET_BUILD_DIR)/cook-bits
-	$(TOOLSDIR)/cook-bits $(TARGET_BUILD_DIR) $(TARGET_BUILD_DIR)/cook-bits $(TARGET_BUILD_DIR)/$(CHROOT_BIN)
+	$(TOOLSDIR)/cook-bits $(TARGET_BUILD_DIR) $(TARGET_BUILD_DIR)/cook-bits $(IMAGEDIR_BASE)/$(CHROOT_BIN)
 
 clean:
 	rm -rf $(TARGET_BUILD_DIR)
\ No newline at end of file