diff --git a/.github/workflows/build-and-test-msi.yaml b/.github/workflows/build-and-test-msi.yaml
index c62ef7d39..326e7a1c3 100644
--- a/.github/workflows/build-and-test-msi.yaml
+++ b/.github/workflows/build-and-test-msi.yaml
@@ -92,7 +92,7 @@ jobs:
           cd deps/finch-core && make clean
       - name: Build project
         run: |
-          make FINCH_ROOTFS_LOCATION_ROOT=/__INSTALLFOLDER__
+          make FINCH_OS_IMAGE_LOCATION_ROOT=/__INSTALLFOLDER__
       - name: generate and download signed msi
         run: |
           $version="${{ needs.get-tag-name.outputs.version }}"
diff --git a/Makefile.darwin b/Makefile.darwin
index e84734c2f..cd74275f6 100644
--- a/Makefile.darwin
+++ b/Makefile.darwin
@@ -12,7 +12,7 @@ FINCH_OS_BASENAME=$(AARCH64_ARTIFACT)
 FINCH_OS_DIGEST=$(AARCH64_512_DIGEST)
 endif
 
-# This variable is used to generate release builds, where the OS iamge path should be overwritten
+# This variable is used to generate release builds, where the OS image path should be overwritten
 # to /Applications/Finch/...
 FINCH_OS_IMAGE_LOCATION_ROOT ?= $(DEST)
 FINCH_IMAGE_LOCATION := $(FINCH_OS_IMAGE_LOCATION_ROOT)/os/$(FINCH_OS_BASENAME)
diff --git a/Makefile.windows b/Makefile.windows
index 797bdcbd5..38d8af816 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -11,7 +11,10 @@ else
 $(error Finch on Windows ARM not supported)
 endif
 
-FINCH_IMAGE_LOCATION := $(OS_OUTDIR)/$(FINCH_ROOTFS_BASENAME)
+# This variable is used to generate release builds, where the OS rootfs path should be overwritten
+# to C:/Program Files/Finch/...
+FINCH_OS_IMAGE_LOCATION_ROOT ?= $(DEST)
+FINCH_IMAGE_LOCATION := $(FINCH_OS_IMAGE_LOCATION_ROOT)/os/$(FINCH_ROOTFS_BASENAME)
 FINCH_IMAGE_DIGEST := "sha512:$(FINCH_ROOTFS_DIGEST)"
 
 $(OS_OUTDIR)/finch.yaml: $(OS_OUTDIR) finch.yaml.d/common.yaml finch.yaml.d/windows.yaml
diff --git a/msi-builder/README.md b/msi-builder/README.md
index eeb2023ba..d1b545d43 100644
--- a/msi-builder/README.md
+++ b/msi-builder/README.md
@@ -4,7 +4,7 @@ Finch Windows MSI Tool to generate MSI installer from Finch build
 
 ## Instructions
 
-[1] Build finch:  `make FINCH_ROOTFS_LOCATION_ROOT=/__INSTALLFOLDER__`
+[1] Build finch:  `make FINCH_OS_IMAGE_LOCATION_ROOT=/__INSTALLFOLDER__`
 
 - It will inject the placeholder `__INSTALLFOLDER__` into `os\finch.yaml` for the rootfs location