diff --git a/.github/workflows/qmk.yml b/.github/workflows/qmk.yml
index 44e1293..9aae54b 100644
--- a/.github/workflows/qmk.yml
+++ b/.github/workflows/qmk.yml
@@ -27,14 +27,25 @@ jobs:
         with:
           path: haunt98_qmk_keymaps
       - name: Copy keymaps
-        run: cp -rf haunt98_qmk_keymaps/dztech_dz60rgb_wkl/keymaps/haunt98 keyboards/dztech/dz60rgb_wkl/keymaps/
+        run: cp -rf haunt98_qmk_keymaps/dztech_dz60rgb_wkl/keymaps/haunt98 \
+          keyboards/dztech/dz60rgb_wkl/keymaps/
       - name: Build firmware
         run: qmk compile -j 8 -kb dztech/dz60rgb_wkl/v2_1 -km haunt98
+      - name: Convert keymaps JSON
+        run: qmk c2json -kb dztech/dz60rgb_wkl/v2_1 -km haunt98 \
+          -o dztech_dz60rgb_wkl_haunt98_keymap.json \
+          haunt98_qmk_keymaps/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
       - name: Archive firmware
         uses: actions/upload-artifact@v3
         with:
-          name: haunt98_qmk_keymaps
+          name: haunt98_firmware
           path: |
             *.hex
             *.bin
             *.uf2
+      - name: Archive keymaps JSON
+        uses: actions/upload-artifact@v3
+        with:
+          name: haunt98_keymaps
+          path: |
+            *_keymap.json