diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
index 1227020b297..10f557d7297 100644
--- a/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
+++ b/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
@@ -2,7 +2,7 @@
     "version": 1,
     "author": "skullydazed",
     "notes": "",
-    "keyboard": "clueboard/2x1800/2018",
+    "keyboard": "clueboard/2x1800/2021",
     "keymap": "default",
     "layout": "LAYOUT_all",
     "layers": [
diff --git a/keyboards/durgod/k320/keymaps/default_mac/keymap.json b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
index a0e83def369..97fc214c7b7 100644
--- a/keyboards/durgod/k320/keymaps/default_mac/keymap.json
+++ b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "durgod/k310/base",
+  "keyboard": "durgod/k320/base",
   "keymap": "default_mac",
   "layout": "LAYOUT_all",
   "layers": [
diff --git a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
index 23c371aa343..3bef21a0b21 100644
--- a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
+++ b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "handwired/pytest/basic",
+    "keyboard": "handwired/pytest/macro",
     "keymap": "default_json",
     "layout": "LAYOUT_ortho_1x1",
     "layers": [["QK_MACRO_0"]],
diff --git a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
index b166c6771ff..2bd5581ac76 100644
--- a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
+++ b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "jacky_studio/piggy60",
+    "keyboard": "jacky_studio/piggy60/rev1/solder",
     "keymap": "via",
     "layout": "LAYOUT_all",
     "layers": [
diff --git a/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json b/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json
index c93d2881520..226952964b9 100644
--- a/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json
+++ b/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "splitkb/aurora/sofle_v2",
+    "keyboard": "splitkb/aurora/sofle_v2/rev1",
     "keymap": "default",
     "version": 1,
     "layout": "LAYOUT",