diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 284849c5..43bef2d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
           sudo apt -y --allow-downgrades install --install-recommends winehq-stable
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up repo
         run: |
@@ -84,7 +84,7 @@ jobs:
 
       - name: Post error upload
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pmdsky-failure-${{ github.run_id }}
           path: failure.tar.gz
@@ -103,6 +103,7 @@ jobs:
           mkdir -p xmap
           cp build/pmdsky.us/*.xMAP xmap/pmdskyus.xMAP
           cp build/pmdsky.eu/*.xMAP xmap/pmdskyeu.xMAP
+          cp build/pmdsky.jp/*.xMAP xmap/pmdskyjp.xMAP
           echo "XMAP_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV
 
       - name: Update xMAP
diff --git a/filesystem.mk b/filesystem.mk
index cb7f6558..755e6e3c 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -51,6 +51,7 @@ NTR_FILE_EXT := bin NCGR NCLR NCER NSCR NSBMD NSBCA NSBTA
 .PHONY: filesystem clean-filesystem clean-fs
 
 filesystem: $(NITROFS_FILES) clean-language-specific-files
+ifeq ($(SKIP_COPY_NITROFS),)
 	cp -r files/language-specific/$(LANGUAGE_SPECIFIC_DIR)/SCRIPT files/SCRIPT
 	cp files/language-specific/$(LANGUAGE_SPECIFIC_DIR)/FONT/banner.bin files/FONT/banner.bin
 	cp files/language-specific/$(LANGUAGE_SPECIFIC_DIR)/FONT/banner_c.bin files/FONT/banner_c.bin
@@ -98,6 +99,7 @@ filesystem: $(NITROFS_FILES) clean-language-specific-files
 	cp files/language-specific/$(JP_SPECIFIC_DIR)/SYSTEM/168.srl files/SYSTEM/168.srl
 	cp files/language-specific/$(JP_SPECIFIC_DIR)/SYSTEM/169.srl files/SYSTEM/169.srl
 	cp files/language-specific/$(JP_SPECIFIC_DIR)/SYSTEM/170.srl files/SYSTEM/170.srl
+endif
 
 ifeq ($(COMPARE),1)
 	$(SHA1SUM) --quiet -c $(WORK_DIR)/$(buildname)/filesystem.sha1
@@ -109,6 +111,7 @@ clean-filesystem: clean-language-specific-files
 	$(RM) -r $(FS_CLEAN_TARGETS)
 
 clean-language-specific-files:
+ifeq ($(SKIP_COPY_NITROFS),)
 	$(RM) -r files/DWC
 	$(RM) -r files/SCRIPT
 	$(RM) files/BALANCE/item_p.bin
@@ -154,3 +157,4 @@ clean-language-specific-files:
 	$(RM) files/SYSTEM/168.srl
 	$(RM) files/SYSTEM/169.srl
 	$(RM) files/SYSTEM/170.srl
+endif