diff --git a/variants/STM32H5xx/H563I(G-I)(K-T)_H563LIHxQ_H573II(K-T)_H573LIHxQ/boards_entry.txt b/variants/STM32H5xx/H563I(G-I)(K-T)_H563LIHxQ_H573II(K-T)_H573LIHxQ/boards_entry.txt
index 0685db51dd..ce1c3cbda3 100644
--- a/variants/STM32H5xx/H563I(G-I)(K-T)_H563LIHxQ_H573II(K-T)_H573LIHxQ/boards_entry.txt
+++ b/variants/STM32H5xx/H563I(G-I)(K-T)_H563LIHxQ_H573II(K-T)_H573LIHxQ/boards_entry.txt
@@ -46,6 +46,7 @@ GenH5.menu.pnum.GENERIC_H563LIHXQ.upload.maximum_data_size=655360
 GenH5.menu.pnum.GENERIC_H563LIHXQ.build.board=GENERIC_H563LIHXQ
 GenH5.menu.pnum.GENERIC_H563LIHXQ.build.product_line=STM32H563xx
 GenH5.menu.pnum.GENERIC_H563LIHXQ.build.variant=STM32H5xx/H563I(G-I)(K-T)_H563LIHxQ_H573II(K-T)_H573LIHxQ
+GenH5.menu.pnum.GENERIC_H563LIHXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H563.svd
 
 # Generic H573IIKx
 GenH5.menu.pnum.GENERIC_H573IIKX=Generic H573IIKx
@@ -72,4 +73,5 @@ GenH5.menu.pnum.GENERIC_H573LIHXQ.upload.maximum_data_size=655360
 GenH5.menu.pnum.GENERIC_H573LIHXQ.build.board=GENERIC_H573LIHXQ
 GenH5.menu.pnum.GENERIC_H573LIHXQ.build.product_line=STM32H573xx
 GenH5.menu.pnum.GENERIC_H573LIHXQ.build.variant=STM32H5xx/H563I(G-I)(K-T)_H563LIHxQ_H573II(K-T)_H573LIHxQ
+GenH5.menu.pnum.GENERIC_H573LIHXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H573.svd
 
diff --git a/variants/STM32WBAxx/WBA6MOIH/boards_entry.txt b/variants/STM32WBAxx/WBA6MOIH/boards_entry.txt
index 3dec7c587f..e4c4c80b09 100644
--- a/variants/STM32WBAxx/WBA6MOIH/boards_entry.txt
+++ b/variants/STM32WBAxx/WBA6MOIH/boards_entry.txt
@@ -10,4 +10,5 @@ GenWBA.menu.pnum.GENERIC_WBA6MOIHX.upload.maximum_data_size=524288
 GenWBA.menu.pnum.GENERIC_WBA6MOIHX.build.board=GENERIC_WBA6MOIHX
 GenWBA.menu.pnum.GENERIC_WBA6MOIHX.build.product_line=STM32WBA6Mxx
 GenWBA.menu.pnum.GENERIC_WBA6MOIHX.build.variant=STM32WBAxx/WBA6MOIH
+GenWBA.menu.pnum.GENERIC_WBA6MOIHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBAxx/STM32WBA6M.svd
 
diff --git a/variants/STM32WL3x/WL3RK(8-B)Vx(X)/boards_entry.txt b/variants/STM32WL3x/WL3RK(8-B)Vx(X)/boards_entry.txt
index fafcbf8632..1a64ea4c42 100644
--- a/variants/STM32WL3x/WL3RK(8-B)Vx(X)/boards_entry.txt
+++ b/variants/STM32WL3x/WL3RK(8-B)Vx(X)/boards_entry.txt
@@ -10,6 +10,7 @@ GenWL3.menu.pnum.GENERIC_WL3RK8VX.upload.maximum_data_size=8192
 GenWL3.menu.pnum.GENERIC_WL3RK8VX.build.board=GENERIC_WL3RK8VX
 GenWL3.menu.pnum.GENERIC_WL3RK8VX.build.product_line=STM32WL3RX
 GenWL3.menu.pnum.GENERIC_WL3RK8VX.build.variant=STM32WL3x/WL3RK(8-B)Vx(X)
+GenWL3.menu.pnum.GENERIC_WL3RK8VX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WL3x/STM32WL3R.svd
 
 # Generic WL3RK8VxX
 GenWL3.menu.pnum.GENERIC_WL3RK8VXX=Generic WL3RK8VxX
@@ -18,6 +19,7 @@ GenWL3.menu.pnum.GENERIC_WL3RK8VXX.upload.maximum_data_size=8192
 GenWL3.menu.pnum.GENERIC_WL3RK8VXX.build.board=GENERIC_WL3RK8VXX
 GenWL3.menu.pnum.GENERIC_WL3RK8VXX.build.product_line=STM32WL3RX
 GenWL3.menu.pnum.GENERIC_WL3RK8VXX.build.variant=STM32WL3x/WL3RK(8-B)Vx(X)
+GenWL3.menu.pnum.GENERIC_WL3RK8VXX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WL3x/STM32WL3R.svd
 
 # Generic WL3RKBVx
 GenWL3.menu.pnum.GENERIC_WL3RKBVX=Generic WL3RKBVx
@@ -26,6 +28,7 @@ GenWL3.menu.pnum.GENERIC_WL3RKBVX.upload.maximum_data_size=16384
 GenWL3.menu.pnum.GENERIC_WL3RKBVX.build.board=GENERIC_WL3RKBVX
 GenWL3.menu.pnum.GENERIC_WL3RKBVX.build.product_line=STM32WL3RX
 GenWL3.menu.pnum.GENERIC_WL3RKBVX.build.variant=STM32WL3x/WL3RK(8-B)Vx(X)
+GenWL3.menu.pnum.GENERIC_WL3RKBVX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WL3x/STM32WL3R.svd
 
 # Generic WL3RKBVxX
 GenWL3.menu.pnum.GENERIC_WL3RKBVXX=Generic WL3RKBVxX
@@ -34,4 +37,5 @@ GenWL3.menu.pnum.GENERIC_WL3RKBVXX.upload.maximum_data_size=16384
 GenWL3.menu.pnum.GENERIC_WL3RKBVXX.build.board=GENERIC_WL3RKBVXX
 GenWL3.menu.pnum.GENERIC_WL3RKBVXX.build.product_line=STM32WL3RX
 GenWL3.menu.pnum.GENERIC_WL3RKBVXX.build.variant=STM32WL3x/WL3RK(8-B)Vx(X)
+GenWL3.menu.pnum.GENERIC_WL3RKBVXX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WL3x/STM32WL3R.svd