diff --git a/keyboards/omkbd/ergodash/mini/keyboard.json b/keyboards/omkbd/ergodash/mini/keyboard.json
index 6286b73b90..7c15c4f6f7 100644
--- a/keyboards/omkbd/ergodash/mini/keyboard.json
+++ b/keyboards/omkbd/ergodash/mini/keyboard.json
@@ -30,7 +30,9 @@
         "levels": 7
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/ergodash/rev1/keyboard.json b/keyboards/omkbd/ergodash/rev1/keyboard.json
index fb4a1c2254..6a61950ba6 100644
--- a/keyboards/omkbd/ergodash/rev1/keyboard.json
+++ b/keyboards/omkbd/ergodash/rev1/keyboard.json
@@ -30,7 +30,9 @@
         "levels": 7
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/3x6/keyboard.json b/keyboards/omkbd/runner3680/3x6/keyboard.json
index 3e1ab5ba82..44c5ce35a0 100644
--- a/keyboards/omkbd/runner3680/3x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x6/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/3x7/keyboard.json b/keyboards/omkbd/runner3680/3x7/keyboard.json
index 496be94925..8a4c55ca71 100644
--- a/keyboards/omkbd/runner3680/3x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x7/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/3x8/keyboard.json b/keyboards/omkbd/runner3680/3x8/keyboard.json
index 80719fd0e4..11fe738a8a 100644
--- a/keyboards/omkbd/runner3680/3x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x8/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/4x6/keyboard.json b/keyboards/omkbd/runner3680/4x6/keyboard.json
index f9d3146a78..2449f3431e 100644
--- a/keyboards/omkbd/runner3680/4x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x6/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/4x7/keyboard.json b/keyboards/omkbd/runner3680/4x7/keyboard.json
index 120e254e5c..01acfad1e7 100644
--- a/keyboards/omkbd/runner3680/4x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x7/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/4x8/keyboard.json b/keyboards/omkbd/runner3680/4x8/keyboard.json
index e0b91088da..748fc05508 100644
--- a/keyboards/omkbd/runner3680/4x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x8/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x6/keyboard.json b/keyboards/omkbd/runner3680/5x6/keyboard.json
index c06bff537f..9b043c7e19 100644
--- a/keyboards/omkbd/runner3680/5x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x6/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
index 4c359b27eb..b8a361f1b2 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
@@ -24,7 +24,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x7/keyboard.json b/keyboards/omkbd/runner3680/5x7/keyboard.json
index 55936eb9d3..41df797770 100644
--- a/keyboards/omkbd/runner3680/5x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x7/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/omkbd/runner3680/5x8/keyboard.json b/keyboards/omkbd/runner3680/5x8/keyboard.json
index 9e96e69bbb..04294371d7 100644
--- a/keyboards/omkbd/runner3680/5x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x8/keyboard.json
@@ -20,7 +20,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "tapping": {
         "term": 120
diff --git a/keyboards/orthodox/rev1/keyboard.json b/keyboards/orthodox/rev1/keyboard.json
index 042187b8bf..0444009f2b 100644
--- a/keyboards/orthodox/rev1/keyboard.json
+++ b/keyboards/orthodox/rev1/keyboard.json
@@ -13,7 +13,9 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/orthodox/rev3/keyboard.json b/keyboards/orthodox/rev3/keyboard.json
index e2b3abd34d..61d8281f55 100644
--- a/keyboards/orthodox/rev3/keyboard.json
+++ b/keyboards/orthodox/rev3/keyboard.json
@@ -13,7 +13,9 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/orthodox/rev3_teensy/keyboard.json b/keyboards/orthodox/rev3_teensy/keyboard.json
index 345ff58145..fd77ba7ae5 100644
--- a/keyboards/orthodox/rev3_teensy/keyboard.json
+++ b/keyboards/orthodox/rev3_teensy/keyboard.json
@@ -13,7 +13,9 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",
diff --git a/keyboards/orthograph/keyboard.json b/keyboards/orthograph/keyboard.json
index ad37b0c723..a3fbf634e5 100644
--- a/keyboards/orthograph/keyboard.json
+++ b/keyboards/orthograph/keyboard.json
@@ -30,7 +30,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "E6",
+        "serial": {
+            "pin": "E6"
+        },
         "transport": {
             "sync_matrix_state": true
         },
diff --git a/keyboards/phoenix/keyboard.json b/keyboards/phoenix/keyboard.json
index ff13389245..f3eb6a8d55 100644
--- a/keyboards/phoenix/keyboard.json
+++ b/keyboards/phoenix/keyboard.json
@@ -34,9 +34,9 @@
             "pin": "B9"
         },
         "serial": {
-            "driver": "usart"
-        },
-        "soft_serial_pin": "A9"
+            "driver": "usart",
+            "pin": "A9"
+        }
     },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/pinky/3/keyboard.json b/keyboards/pinky/3/keyboard.json
index 770d368399..32e1f893e5 100644
--- a/keyboards/pinky/3/keyboard.json
+++ b/keyboards/pinky/3/keyboard.json
@@ -14,7 +14,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/pinky/4/keyboard.json b/keyboards/pinky/4/keyboard.json
index 01e44a647b..20f86e3f38 100644
--- a/keyboards/pinky/4/keyboard.json
+++ b/keyboards/pinky/4/keyboard.json
@@ -14,7 +14,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/pisces/keyboard.json b/keyboards/pisces/keyboard.json
index afdddfaf4d..1601cbc3a9 100644
--- a/keyboards/pisces/keyboard.json
+++ b/keyboards/pisces/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/pluckey/keyboard.json b/keyboards/pluckey/keyboard.json
index 9517bf54b4..57f6b2467f 100644
--- a/keyboards/pluckey/keyboard.json
+++ b/keyboards/pluckey/keyboard.json
@@ -35,13 +35,15 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
         "encoder": {
             "right": {
                 "rotary": [
                     {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
                 ]
             }
+        },
+        "serial": {
+            "pin": "D2"
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json
index abd94d599a..2000593e62 100644
--- a/keyboards/pteron36/keyboard.json
+++ b/keyboards/pteron36/keyboard.json
@@ -40,13 +40,15 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3",
         "encoder": {
             "right": {
                 "rotary": [
                     {"pin_a": "F4", "pin_b": "F5"}
                 ]
             }
+        },
+        "serial": {
+            "pin": "D3"
         }
     },
     "rgblight": {
diff --git a/keyboards/quokka/keyboard.json b/keyboards/quokka/keyboard.json
index a92a113f3e..b04f569c8c 100644
--- a/keyboards/quokka/keyboard.json
+++ b/keyboards/quokka/keyboard.json
@@ -66,9 +66,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "GP0",
         "serial": {
-            "driver": "vendor"
+            "driver": "vendor",
+            "pin": "GP0"
         }
     },
     "url": "https://github.com/dlford/quokka",
diff --git a/keyboards/qwertyydox/rev1/keyboard.json b/keyboards/qwertyydox/rev1/keyboard.json
index f2a335aa02..24284ff8c0 100644
--- a/keyboards/qwertyydox/rev1/keyboard.json
+++ b/keyboards/qwertyydox/rev1/keyboard.json
@@ -40,7 +40,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "qmk": {
     "locking": {
diff --git a/keyboards/rainkeebs/trailmix/keyboard.json b/keyboards/rainkeebs/trailmix/keyboard.json
index 7b3cfdfcdd..b871a8c9af 100644
--- a/keyboards/rainkeebs/trailmix/keyboard.json
+++ b/keyboards/rainkeebs/trailmix/keyboard.json
@@ -30,7 +30,9 @@
                 ]
             }
         },
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "url": "https://www.rainkeebs.mx",
     "usb": {
diff --git a/keyboards/recompile_keys/choco60/rev1/keyboard.json b/keyboards/recompile_keys/choco60/rev1/keyboard.json
index 150037acee..4e5a8903bd 100644
--- a/keyboards/recompile_keys/choco60/rev1/keyboard.json
+++ b/keyboards/recompile_keys/choco60/rev1/keyboard.json
@@ -15,7 +15,9 @@
         "handedness": {
             "pin": "D0"
         },
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina"
diff --git a/keyboards/recompile_keys/choco60/rev2/keyboard.json b/keyboards/recompile_keys/choco60/rev2/keyboard.json
index 47c5a0beb9..84ca0bd9a1 100644
--- a/keyboards/recompile_keys/choco60/rev2/keyboard.json
+++ b/keyboards/recompile_keys/choco60/rev2/keyboard.json
@@ -15,7 +15,9 @@
         "handedness": {
             "pin": "D1"
         },
-        "soft_serial_pin": "D0",
+        "serial": {
+            "pin": "D0"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
diff --git a/keyboards/recompile_keys/cocoa40/keyboard.json b/keyboards/recompile_keys/cocoa40/keyboard.json
index 465cd395c7..45f0cba2ff 100644
--- a/keyboards/recompile_keys/cocoa40/keyboard.json
+++ b/keyboards/recompile_keys/cocoa40/keyboard.json
@@ -26,7 +26,9 @@
         "handedness": {
             "pin": "D3"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/redox/rev1/base/keyboard.json b/keyboards/redox/rev1/base/keyboard.json
index a4a3f3fe96..e6fa9fc692 100644
--- a/keyboards/redox/rev1/base/keyboard.json
+++ b/keyboards/redox/rev1/base/keyboard.json
@@ -8,7 +8,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/redox_media/keyboard.json b/keyboards/redox_media/keyboard.json
index baf1cfeb43..83057da79f 100644
--- a/keyboards/redox_media/keyboard.json
+++ b/keyboards/redox_media/keyboard.json
@@ -33,7 +33,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json
index 7eae34c18f..ec02a2f2dd 100644
--- a/keyboards/rgbkb/mun/rev1/keyboard.json
+++ b/keyboards/rgbkb/mun/rev1/keyboard.json
@@ -115,7 +115,6 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "A9",
         "transport": {
             "sync": {
                 "indicators": true,
@@ -124,7 +123,8 @@
             }
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "A9"
         }
     },
     "processor": "STM32F303",
diff --git a/keyboards/rgbkb/sol/rev1/keyboard.json b/keyboards/rgbkb/sol/rev1/keyboard.json
index 9607e76259..38932a78e1 100644
--- a/keyboards/rgbkb/sol/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol/rev1/keyboard.json
@@ -92,7 +92,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "tapping": {
         "term": 150
diff --git a/keyboards/rgbkb/sol/rev2/keyboard.json b/keyboards/rgbkb/sol/rev2/keyboard.json
index 1a5ca12ed9..b6bad358e3 100644
--- a/keyboards/rgbkb/sol/rev2/keyboard.json
+++ b/keyboards/rgbkb/sol/rev2/keyboard.json
@@ -90,7 +90,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "tapping": {
         "term": 150
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index edf70636e7..a81ea7bc21 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -130,7 +130,6 @@
                 "pins": ["A14", "B0"]
             }
         },
-        "soft_serial_pin": "A9",
         "encoder": {
             "right": {
                 "rotary": [
@@ -150,7 +149,8 @@
             }
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "A9"
         },
         "transport": {
             "sync": {
diff --git a/keyboards/rgbkb/zen/rev1/keyboard.json b/keyboards/rgbkb/zen/rev1/keyboard.json
index 8e192d9dfd..91d127de58 100644
--- a/keyboards/rgbkb/zen/rev1/keyboard.json
+++ b/keyboards/rgbkb/zen/rev1/keyboard.json
@@ -29,7 +29,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "rgblight": {
     "led_count": 16
diff --git a/keyboards/rgbkb/zen/rev2/keyboard.json b/keyboards/rgbkb/zen/rev2/keyboard.json
index 9079185b26..b59af6dfdd 100644
--- a/keyboards/rgbkb/zen/rev2/keyboard.json
+++ b/keyboards/rgbkb/zen/rev2/keyboard.json
@@ -35,7 +35,9 @@
     },
     "split": {
       "enabled": true,
-      "soft_serial_pin": "D3"
+      "serial": {
+        "pin": "D3"
+      }
     },
     "rgblight": {
       "led_count": 34,
diff --git a/keyboards/rgbkb/zygomorph/rev1/keyboard.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
index fc92e0746d..21b9648431 100644
--- a/keyboards/rgbkb/zygomorph/rev1/keyboard.json
+++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
@@ -93,7 +93,9 @@
     },
     "split": {
       "enabled": true,
-      "soft_serial_pin": "D3"
+      "serial": {
+        "pin": "D3"
+      }
     },
     "rgblight": {
       "split_count": [30, 30],
diff --git a/keyboards/rura66/rev1/keyboard.json b/keyboards/rura66/rev1/keyboard.json
index 43f6578394..cb9ad6f29a 100644
--- a/keyboards/rura66/rev1/keyboard.json
+++ b/keyboards/rura66/rev1/keyboard.json
@@ -48,7 +48,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
index 864e1835fd..4a338811ea 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/7splus/keyboard.json b/keyboards/salicylic_acid3/7splus/keyboard.json
index c33d00d867..d04b8ad45b 100644
--- a/keyboards/salicylic_acid3/7splus/keyboard.json
+++ b/keyboards/salicylic_acid3/7splus/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/ajisai74/keyboard.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json
index 41abc9c623..62d475d9df 100644
--- a/keyboards/salicylic_acid3/ajisai74/keyboard.json
+++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/ergoarrows/keyboard.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
index 41cb0da90f..122d2e0ee6 100644
--- a/keyboards/salicylic_acid3/ergoarrows/keyboard.json
+++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/guide68/keyboard.json b/keyboards/salicylic_acid3/guide68/keyboard.json
index 629afac8f7..f32db9646d 100644
--- a/keyboards/salicylic_acid3/guide68/keyboard.json
+++ b/keyboards/salicylic_acid3/guide68/keyboard.json
@@ -54,7 +54,9 @@
         "transport": {
             "protocol": "serial"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
index d17e0fd3bc..e4525ecf74 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
index 2786f50a03..3bac1d8864 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
@@ -31,7 +31,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
index 52a503c940..5037414c3d 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
@@ -27,7 +27,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
index 6cc6897659..688edf53d3 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/salicylic_acid3/nknl7en/keyboard.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json
index c41be45376..554430f6c4 100644
--- a/keyboards/salicylic_acid3/nknl7en/keyboard.json
+++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/salicylic_acid3/nknl7jp/keyboard.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
index 2fab8e8f7e..b8a9196f88 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keyboard.json
+++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
@@ -33,7 +33,9 @@
         "handedness": {
             "pin": "B6"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "hue_steps": 10,
diff --git a/keyboards/scatter42/keyboard.json b/keyboards/scatter42/keyboard.json
index 63aaaa46b2..7bb7a63ffe 100644
--- a/keyboards/scatter42/keyboard.json
+++ b/keyboards/scatter42/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/sekigon/grs_70ec/keyboard.json b/keyboards/sekigon/grs_70ec/keyboard.json
index fbea73fb99..7b3573c768 100644
--- a/keyboards/sekigon/grs_70ec/keyboard.json
+++ b/keyboards/sekigon/grs_70ec/keyboard.json
@@ -23,7 +23,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D3"
+        "serial": {
+            "pin": "D3"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/silverbullet44/keyboard.json b/keyboards/silverbullet44/keyboard.json
index a58aed8820..69c291a1cc 100644
--- a/keyboards/silverbullet44/keyboard.json
+++ b/keyboards/silverbullet44/keyboard.json
@@ -56,7 +56,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json b/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json
index c645bfbaff..d95f0f20be 100644
--- a/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json
+++ b/keyboards/sleepy_craft_studios/sleepy_keeb_split/keyboard.json
@@ -29,7 +29,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "usb_detect": {
             "enabled": true
         }
diff --git a/keyboards/sofle/info.json b/keyboards/sofle/info.json
index 91fdfd38be..b785d7e7b6 100644
--- a/keyboards/sofle/info.json
+++ b/keyboards/sofle/info.json
@@ -20,7 +20,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/sofle_choc/keyboard.json b/keyboards/sofle_choc/keyboard.json
index c4d9822371..0a25985d4f 100644
--- a/keyboards/sofle_choc/keyboard.json
+++ b/keyboards/sofle_choc/keyboard.json
@@ -118,7 +118,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json
index 1e04608349..4e3682a8c2 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -29,7 +29,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/sparrow62/keyboard.json b/keyboards/sparrow62/keyboard.json
index 6f5ebd540f..96447b6a36 100644
--- a/keyboards/sparrow62/keyboard.json
+++ b/keyboards/sparrow62/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "F4"
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/spleeb/keyboard.json b/keyboards/spleeb/keyboard.json
index 4d137ef10d..56b0bc83b0 100644
--- a/keyboards/spleeb/keyboard.json
+++ b/keyboards/spleeb/keyboard.json
@@ -29,7 +29,6 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "GP1",
         "encoder": {
             "right": {
                 "rotary": [
@@ -45,7 +44,8 @@
             }
         },
         "serial": {
-            "driver": "vendor"
+            "driver": "vendor",
+            "pin": "GP1"
         }
     },
     "url": "https://github.com/chrishoage/spleeb",
diff --git a/keyboards/split67/keyboard.json b/keyboards/split67/keyboard.json
index f9a3632c01..46b571420a 100644
--- a/keyboards/split67/keyboard.json
+++ b/keyboards/split67/keyboard.json
@@ -33,7 +33,9 @@
                 "rows": ["D4", "C6", "D7", "E6", "B4"]
             }
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "url": "",
     "usb": {
diff --git a/keyboards/splitkb/aurora/corne/rev1/keyboard.json b/keyboards/splitkb/aurora/corne/rev1/keyboard.json
index cf3516f34f..40983ec28d 100644
--- a/keyboards/splitkb/aurora/corne/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/corne/rev1/keyboard.json
@@ -82,7 +82,6 @@
         "bootmagic": {
             "matrix": [4, 5]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["B1", "B3", "B2", "B6"],
@@ -99,6 +98,9 @@
         "handedness": {
             "pin": "F4"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/splitkb/aurora/helix/rev1/keyboard.json b/keyboards/splitkb/aurora/helix/rev1/keyboard.json
index 1844e5951e..0c3569f26c 100644
--- a/keyboards/splitkb/aurora/helix/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/helix/rev1/keyboard.json
@@ -127,7 +127,9 @@
                 "rows": ["F4", "F5", "F6", "F7", "B1"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "usb": {
         "pid": "0xB4C4"
diff --git a/keyboards/splitkb/aurora/lily58/rev1/keyboard.json b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
index 1284fc2319..60645f9deb 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
@@ -93,7 +93,6 @@
         "bootmagic": {
             "matrix": [5, 0]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["F4", "D4", "B3", "B2", "B6"],
@@ -110,6 +109,9 @@
         "handedness": {
             "pin": "F5"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
index 8b702c4001..6c72888b10 100644
--- a/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
@@ -121,7 +121,9 @@
                 "rows": ["B3", "B1", "F7", "F6", "F5"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "usb": {
         "pid": "0xEC32"
diff --git a/keyboards/splitkb/aurora/sweep/rev1/keyboard.json b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
index eb62369603..e90995b207 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
@@ -78,7 +78,6 @@
         "bootmagic": {
             "matrix": [4, 4]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["B1", "F7", "F6", "B3"],
@@ -96,6 +95,9 @@
         "handedness": {
             "pin": "F4"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/splitkb/kyria/rev1/base/keyboard.json b/keyboards/splitkb/kyria/rev1/base/keyboard.json
index df92d71ad1..9cb4485c44 100644
--- a/keyboards/splitkb/kyria/rev1/base/keyboard.json
+++ b/keyboards/splitkb/kyria/rev1/base/keyboard.json
@@ -11,7 +11,9 @@
         ]
     },
     "split": {
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/splitkb/kyria/rev2/base/keyboard.json b/keyboards/splitkb/kyria/rev2/base/keyboard.json
index 8de0f335cc..49428ca30a 100644
--- a/keyboards/splitkb/kyria/rev2/base/keyboard.json
+++ b/keyboards/splitkb/kyria/rev2/base/keyboard.json
@@ -14,7 +14,9 @@
         "handedness": {
             "matrix_grid": ["E6", "B3"]
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/splitkb/kyria/rev3/keyboard.json b/keyboards/splitkb/kyria/rev3/keyboard.json
index a2f21826e8..580aa821db 100644
--- a/keyboards/splitkb/kyria/rev3/keyboard.json
+++ b/keyboards/splitkb/kyria/rev3/keyboard.json
@@ -95,7 +95,6 @@
         "bootmagic": {
             "matrix": [4, 6]
         },
-        "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
                 "rows": ["F6", "F7", "B1", "B3"],
@@ -112,6 +111,9 @@
         "handedness": {
             "pin": "B5"
         },
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "matrix_state": true
diff --git a/keyboards/supersplit/keyboard.json b/keyboards/supersplit/keyboard.json
index 6748321ff3..3950d2bbce 100644
--- a/keyboards/supersplit/keyboard.json
+++ b/keyboards/supersplit/keyboard.json
@@ -25,7 +25,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "layouts": {
         "LAYOUT_split_6x4_9": {
diff --git a/keyboards/takashicompany/compacx/keyboard.json b/keyboards/takashicompany/compacx/keyboard.json
index b4460cce77..71d6d2ec74 100644
--- a/keyboards/takashicompany/compacx/keyboard.json
+++ b/keyboards/takashicompany/compacx/keyboard.json
@@ -60,7 +60,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/takashicompany/dogtag/keyboard.json b/keyboards/takashicompany/dogtag/keyboard.json
index 675b8e6bd2..af8d2119d4 100644
--- a/keyboards/takashicompany/dogtag/keyboard.json
+++ b/keyboards/takashicompany/dogtag/keyboard.json
@@ -30,7 +30,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/takashicompany/heavy_left/keyboard.json b/keyboards/takashicompany/heavy_left/keyboard.json
index 3109e1ad83..5eb1596010 100644
--- a/keyboards/takashicompany/heavy_left/keyboard.json
+++ b/keyboards/takashicompany/heavy_left/keyboard.json
@@ -45,7 +45,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "development_board": "promicro",
     "layouts": {
diff --git a/keyboards/takashicompany/minidivide/keyboard.json b/keyboards/takashicompany/minidivide/keyboard.json
index 2234cd9b39..4ae089fbee 100644
--- a/keyboards/takashicompany/minidivide/keyboard.json
+++ b/keyboards/takashicompany/minidivide/keyboard.json
@@ -47,7 +47,9 @@
                 "rows": ["F4", "F5", "F6", "F7"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "url": "",
     "usb": {
diff --git a/keyboards/takashicompany/minidivide_max/keyboard.json b/keyboards/takashicompany/minidivide_max/keyboard.json
index 32e67e944d..54f9dbaf78 100644
--- a/keyboards/takashicompany/minidivide_max/keyboard.json
+++ b/keyboards/takashicompany/minidivide_max/keyboard.json
@@ -45,7 +45,9 @@
                 "rows": ["F4", "F5", "F6", "F7", "B1"]
             }
         },
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "url": "",
     "usb": {
diff --git a/keyboards/takashiski/hecomi/alpha/keyboard.json b/keyboards/takashiski/hecomi/alpha/keyboard.json
index 0a6bf513f0..edb920c82d 100644
--- a/keyboards/takashiski/hecomi/alpha/keyboard.json
+++ b/keyboards/takashiski/hecomi/alpha/keyboard.json
@@ -30,7 +30,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D1"
+    "serial": {
+      "pin": "D1"
+    }
   },
   "rgblight": {
     "saturation_steps": 8,
diff --git a/keyboards/takashiski/otaku_split/rev0/keyboard.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json
index e8e3b35d62..193254aa1a 100644
--- a/keyboards/takashiski/otaku_split/rev0/keyboard.json
+++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/takashiski/otaku_split/rev1/keyboard.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json
index d4195b5a90..16f0cb8ccf 100644
--- a/keyboards/takashiski/otaku_split/rev1/keyboard.json
+++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json
@@ -32,7 +32,9 @@
         "handedness": {
             "pin": "D2"
         },
-        "soft_serial_pin": "D0",
+        "serial": {
+            "pin": "D0"
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index c2a198835f..9804559a2b 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -52,7 +52,6 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "A15",
         "matrix_pins": {
             "right": {
                 "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
@@ -60,7 +59,8 @@
             }
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "A15"
         }
     },
     "qmk": {
diff --git a/keyboards/tweetydabird/lotus58/elite_c/keyboard.json b/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
index af1a9f913c..2a4c4a21bc 100644
--- a/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
@@ -24,9 +24,11 @@
         "handedness": {
             "pin": "B5"
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
-    },
+    }
 }
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
index e7586e6f2f..85f37a265c 100644
--- a/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
@@ -24,9 +24,11 @@
         "handedness": {
             "pin": "B5"
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
-    },
+    }
 }
diff --git a/keyboards/tweetydabird/lotus58/promicro/keyboard.json b/keyboards/tweetydabird/lotus58/promicro/keyboard.json
index 62ee0355ef..83532c8ee2 100644
--- a/keyboards/tweetydabird/lotus58/promicro/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/promicro/keyboard.json
@@ -23,9 +23,11 @@
         "handedness": {
             "pin": "B5"
         },
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        }
     },
     "ws2812": {
         "pin": "D3"
-    },
+    }
 }
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
index 24f27c276a..07fb343974 100644
--- a/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
@@ -18,9 +18,9 @@
             }
         },
         "serial": {
-            "driver": "vendor"
+            "driver": "vendor",
+            "pin": "GP1"
         },
-        "soft_serial_pin": "GP1",
         "handedness": {
             "pin": "GP9"
         }
diff --git a/keyboards/tzarc/djinn/rev1/keyboard.json b/keyboards/tzarc/djinn/rev1/keyboard.json
index b6ee5acba1..8ae4f0c553 100644
--- a/keyboards/tzarc/djinn/rev1/keyboard.json
+++ b/keyboards/tzarc/djinn/rev1/keyboard.json
@@ -6,10 +6,12 @@
     "max_brightness": 144
   },
   "split": {
-    "soft_serial_pin": "B9",
     "handedness": {
       "pin": "B11"
     },
+    "serial": {
+      "pin": "B9"
+    },
     "usb_detect": {
       "enabled": true
     }
diff --git a/keyboards/unikeyboard/diverge3/keyboard.json b/keyboards/unikeyboard/diverge3/keyboard.json
index 36f056187b..767f44b198 100644
--- a/keyboards/unikeyboard/diverge3/keyboard.json
+++ b/keyboards/unikeyboard/diverge3/keyboard.json
@@ -35,7 +35,9 @@
   },
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D0"
+    "serial": {
+      "pin": "D0"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/unikeyboard/divergetm2/keyboard.json b/keyboards/unikeyboard/divergetm2/keyboard.json
index b2db7a19db..09d481149c 100644
--- a/keyboards/unikeyboard/divergetm2/keyboard.json
+++ b/keyboards/unikeyboard/divergetm2/keyboard.json
@@ -29,7 +29,9 @@
     "diode_direction": "ROW2COL",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/uzu42/rev1/keyboard.json b/keyboards/uzu42/rev1/keyboard.json
index 71d9f424cc..f96327daea 100644
--- a/keyboards/uzu42/rev1/keyboard.json
+++ b/keyboards/uzu42/rev1/keyboard.json
@@ -22,7 +22,9 @@
   "diode_direction": "COL2ROW",
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D2"
+    "serial": {
+      "pin": "D2"
+    }
   },
   "ws2812": {
     "pin": "D3"
diff --git a/keyboards/vitamins_included/rev1/keyboard.json b/keyboards/vitamins_included/rev1/keyboard.json
index dc55407b6a..309b065e1b 100644
--- a/keyboards/vitamins_included/rev1/keyboard.json
+++ b/keyboards/vitamins_included/rev1/keyboard.json
@@ -15,7 +15,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "led_count": 16,
diff --git a/keyboards/vitamins_included/rev2/keyboard.json b/keyboards/vitamins_included/rev2/keyboard.json
index bead425252..5a2898d85c 100644
--- a/keyboards/vitamins_included/rev2/keyboard.json
+++ b/keyboards/vitamins_included/rev2/keyboard.json
@@ -18,7 +18,9 @@
         "handedness": {
             "pin": "B4"
         },
-        "soft_serial_pin": "D0"
+        "serial": {
+            "pin": "D0"
+        }
     },
     "rgblight": {
         "led_count": 12,
diff --git a/keyboards/waterfowl/keyboard.json b/keyboards/waterfowl/keyboard.json
index a178313042..73f62a77eb 100644
--- a/keyboards/waterfowl/keyboard.json
+++ b/keyboards/waterfowl/keyboard.json
@@ -29,7 +29,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "transport": {
             "sync": {
                 "modifiers": true,
diff --git a/keyboards/xenon/keyboard.json b/keyboards/xenon/keyboard.json
index 7f78988525..0229f73ebd 100644
--- a/keyboards/xenon/keyboard.json
+++ b/keyboards/xenon/keyboard.json
@@ -35,7 +35,9 @@
   },
   "split": {
     "enabled": true,
-    "soft_serial_pin": "D2"
+    "serial": {
+      "pin": "D2"
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/yoichiro/lunakey_mini/keyboard.json b/keyboards/yoichiro/lunakey_mini/keyboard.json
index e31f09c285..177b3afaa6 100644
--- a/keyboards/yoichiro/lunakey_mini/keyboard.json
+++ b/keyboards/yoichiro/lunakey_mini/keyboard.json
@@ -25,7 +25,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/yosino58/rev1/keyboard.json b/keyboards/yosino58/rev1/keyboard.json
index 2e50450a27..ffc1a5d827 100644
--- a/keyboards/yosino58/rev1/keyboard.json
+++ b/keyboards/yosino58/rev1/keyboard.json
@@ -15,7 +15,9 @@
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "serial": {
+            "pin": "D2"
+        }
     },
     "rgblight": {
         "led_count": 12
diff --git a/keyboards/yushakobo/ergo68/keyboard.json b/keyboards/yushakobo/ergo68/keyboard.json
index c4a143cb73..bc61e979b7 100644
--- a/keyboards/yushakobo/ergo68/keyboard.json
+++ b/keyboards/yushakobo/ergo68/keyboard.json
@@ -127,14 +127,16 @@
         "handedness": {
             "pin": "B6"
         },
+        "serial": {
+            "pin": "D0"
+        },
         "transport": {
             "sync": {
                 "indicators": true,
                 "layer_state": true,
                 "matrix_state": true
             }
-        },
-        "soft_serial_pin": "D0"
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keyboard.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
index 81854128da..e91f96f0ac 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
@@ -28,7 +28,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/zigotica/z34/keyboard.json b/keyboards/zigotica/z34/keyboard.json
index c08934360e..0a96fa0091 100644
--- a/keyboards/zigotica/z34/keyboard.json
+++ b/keyboards/zigotica/z34/keyboard.json
@@ -32,7 +32,9 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2",
+        "serial": {
+            "pin": "D2"
+        },
         "matrix_pins": {
             "right": {
                 "direct": [
diff --git a/keyboards/zvecr/split_blackpill/keyboard.json b/keyboards/zvecr/split_blackpill/keyboard.json
index f5bc458d73..d22914d3bd 100644
--- a/keyboards/zvecr/split_blackpill/keyboard.json
+++ b/keyboards/zvecr/split_blackpill/keyboard.json
@@ -27,9 +27,9 @@
             "pin": "B3"
         },
         "serial": {
-            "driver": "usart"
+            "driver": "usart",
+            "pin": "B6"
         },
-        "soft_serial_pin": "B6",
         "bootmagic": {
             "matrix": [4, 0]
         },