diff --git a/config/generic-bigtreetech-manta-e3ez.cfg b/config/generic-bigtreetech-manta-e3ez.cfg
index 199eae708..39f12fd2a 100644
--- a/config/generic-bigtreetech-manta-e3ez.cfg
+++ b/config/generic-bigtreetech-manta-e3ez.cfg
@@ -133,44 +133,34 @@ max_z_accel: 100
 
 #[tmc2130 stepper_x]
 #cs_pin: PB8
-#spi_software_miso_pin: PC11
-#spi_software_mosi_pin: PC12
-#spi_software_sclk_pin: PC10
+#spi_bus: spi3_PC11_PC12_PC10
 ##diag1_pin: PF3
 #run_current: 0.800
 #stealthchop_threshold: 999999
 
 #[tmc2130 stepper_y]
 #cs_pin: PC9
-#spi_software_miso_pin: PC11
-#spi_software_mosi_pin: PC12
-#spi_software_sclk_pin: PC10
+#spi_bus: spi3_PC11_PC12_PC10
 ##diag1_pin: PF4
 #run_current: 0.800
 #stealthchop_threshold: 999999
 
 #[tmc2130 stepper_z]
 #cs_pin: PD0
-#spi_software_miso_pin: PC11
-#spi_software_mosi_pin: PC12
-#spi_software_sclk_pin: PC10
+#spi_bus: spi3_PC11_PC12_PC10
 ##diag1_pin: PF5
 #run_current: 0.650
 #stealthchop_threshold: 999999
 
 #[tmc2130 extruder]
 #cs_pin: PD1
-#spi_software_miso_pin: PC11
-#spi_software_mosi_pin: PC12
-#spi_software_sclk_pin: PC10
+#spi_bus: spi3_PC11_PC12_PC10
 #run_current: 0.800
 #stealthchop_threshold: 999999
 
 #[tmc2130 extruder1]
 #cs_pin: PB5
-#spi_software_miso_pin: PC11
-#spi_software_mosi_pin: PC12
-#spi_software_sclk_pin: PC10
+#spi_bus: spi3_PC11_PC12_PC10
 #run_current: 0.800
 #stealthchop_threshold: 999999
 
@@ -195,6 +185,4 @@ aliases:
 
 #[adxl345]
 #cs_pin: PC15
-#spi_software_miso_pin: PC11
-#spi_software_mosi_pin: PC12
-#spi_software_sclk_pin: PC10
+#spi_bus: spi3_PC11_PC12_PC10
diff --git a/config/sample-bigtreetech-ebb-canbus-v1.1.cfg b/config/sample-bigtreetech-ebb-canbus-v1.1.cfg
index c84abf173..8da7cccd4 100644
--- a/config/sample-bigtreetech-ebb-canbus-v1.1.cfg
+++ b/config/sample-bigtreetech-ebb-canbus-v1.1.cfg
@@ -11,9 +11,7 @@ serial: /dev/serial/by-id/usb-Klipper_Klipper_firmware_12345-if00
 
 [adxl345]
 cs_pin: EBBCan:PB12
-spi_software_sclk_pin: EBBCan:PB10
-spi_software_mosi_pin: EBBCan:PB11
-spi_software_miso_pin: EBBCan:PB2
+spi_bus: spi2_PB2_PB11_PB10
 axes_map: x,y,z
 
 [extruder]
diff --git a/config/sample-bigtreetech-ebb-canbus-v1.2.cfg b/config/sample-bigtreetech-ebb-canbus-v1.2.cfg
index 053b783c3..7b55a91cf 100644
--- a/config/sample-bigtreetech-ebb-canbus-v1.2.cfg
+++ b/config/sample-bigtreetech-ebb-canbus-v1.2.cfg
@@ -11,9 +11,7 @@ serial: /dev/serial/by-id/usb-Klipper_Klipper_firmware_12345-if00
 
 [adxl345]
 cs_pin: EBBCan:PB12
-spi_software_sclk_pin: EBBCan:PB10
-spi_software_mosi_pin: EBBCan:PB11
-spi_software_miso_pin: EBBCan:PB2
+spi_bus: spi2_PB2_PB11_PB10
 axes_map: x,y,z
 
 [extruder]
diff --git a/config/sample-bigtreetech-ebb-sb-canbus-v1.0.cfg b/config/sample-bigtreetech-ebb-sb-canbus-v1.0.cfg
index 192d385e5..1e60467dd 100644
--- a/config/sample-bigtreetech-ebb-sb-canbus-v1.0.cfg
+++ b/config/sample-bigtreetech-ebb-sb-canbus-v1.0.cfg
@@ -15,9 +15,7 @@ sensor_pin: EBBCan:PA2
 
 [adxl345]
 cs_pin: EBBCan:PB12
-spi_software_sclk_pin: EBBCan:PB10
-spi_software_mosi_pin: EBBCan:PB11
-spi_software_miso_pin: EBBCan:PB2
+spi_bus: spi2_PB2_PB11_PB10
 axes_map: x,y,z
 
 [extruder]