diff --git a/Makefile b/Makefile
index 821fa298e7..970359dea9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,16 @@ QMK_REPO ?= zsa/qmk_firmware
 QMK_BRANCH ?= firmware22
 
 .PHONY: build
-build: zsa_firmware/keyboards/moonlander/keymaps/mcoding  zsa_firmware/.build/moonlander_mcoding.bin
+build: zsa_firmware/keyboards/zsa/moonlander/keymaps/mcoding  zsa_firmware/.build/moonlander_mcoding.bin
 
 .PHONY: qmk_setup
 qmk_setup:
 	make -C zsa_firmware git-submodules
 	cd zsa_firmware && qmk setup $(QMK_REPO) -b $(QMK_BRANCH) -y
 
-zsa_firmware/keyboards/moonlander/keymaps/mcoding: mcoding qmk_setup
+zsa_firmware/keyboards/zsa/moonlander/keymaps/mcoding: mcoding qmk_setup
 	rm -rf "$@"
 	cp -r "$<" "$@"
 
 zsa_firmware/.build/moonlander_mcoding.bin: mcoding qmk_setup
-	make -C zsa_firmware moonlander:mcoding
+	make -C zsa_firmware zsa/moonlander:mcoding
diff --git a/zsa_firmware b/zsa_firmware
index e777bc9d1a..0b6f7f996c 160000
--- a/zsa_firmware
+++ b/zsa_firmware
@@ -1 +1 @@
-Subproject commit e777bc9d1ac1ba32d205d061fc2051c3a3d7f138
+Subproject commit 0b6f7f996cbd9f2eddde5413baf937cd70efb5d1