diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/Makefile b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/Makefile
index df27139b1..cdfdf18b2 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/Makefile
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/Makefile
@@ -108,7 +108,9 @@ include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMv7-M-ALT/compilers/GCC/mk/port.mk
+# SB files (optional).
 include $(CHIBIOS)/os/sb/host/compilers/GCC/sbhost.mk
+#include $(CHIBIOS)/os/sb/vhal/sbvhal.mk
 # VFS files (optional).
 include $(CHIBIOS)/os/vfs/vfs.mk
 # Auto-build files in ./source recursively.
diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/sbconf.h b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/sbconf.h
index 82ee7603a..089aee3d1 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/sbconf.h
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/sbconf.h
@@ -56,7 +56,7 @@
  * @brief   Enables support for sandbox Virtual HAL.
  */
 #if !defined(SB_CFG_ENABLE_VHAL) || defined(__DOXYGEN__)
-#define SB_CFG_ENABLE_VHAL                  TRUE
+#define SB_CFG_ENABLE_VHAL                  FALSE
 #endif
 
 /**
diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile
index 83b92a807..de2a641d6 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile
@@ -110,7 +110,6 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMv7-M-ALT/compilers/GCC/mk/port.mk
 # SB files (optional).
 include $(CHIBIOS)/os/sb/host/compilers/GCC/sbhost.mk
-# VHAL files (optional).
 include $(CHIBIOS)/os/sb/vhal/sbvhal.mk
 # VFS files (optional).
 include $(CHIBIOS)/os/vfs/vfs.mk
diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/Makefile b/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/Makefile
index db64db936..c4877db5f 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/Makefile
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/Makefile
@@ -108,7 +108,9 @@ include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMv7-M-ALT/compilers/GCC/mk/port.mk
+# SB files (optional).
 include $(CHIBIOS)/os/sb/host/compilers/GCC/sbhost.mk
+#include $(CHIBIOS)/os/sb/vhal/sbvhal.mk
 # VFS files (optional).
 include $(CHIBIOS)/os/vfs/vfs.mk
 include $(CHIBIOS)/os/vfs/vfs_syscalls.mk
diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/cfg/sbconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/cfg/sbconf.h
index 82ee7603a..089aee3d1 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/cfg/sbconf.h
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY-RAM_SB_HOST_DYNAMIC/cfg/sbconf.h
@@ -56,7 +56,7 @@
  * @brief   Enables support for sandbox Virtual HAL.
  */
 #if !defined(SB_CFG_ENABLE_VHAL) || defined(__DOXYGEN__)
-#define SB_CFG_ENABLE_VHAL                  TRUE
+#define SB_CFG_ENABLE_VHAL                  FALSE
 #endif
 
 /**
diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/Makefile b/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/Makefile
index 22d328552..7be57efd0 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/Makefile
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/Makefile
@@ -108,7 +108,9 @@ include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMv7-M-ALT/compilers/GCC/mk/port.mk
+# SB files (optional).
 include $(CHIBIOS)/os/sb/host/compilers/GCC/sbhost.mk
+#include $(CHIBIOS)/os/sb/vhal/sbvhal.mk
 # VFS files (optional).
 include $(CHIBIOS)/os/vfs/vfs.mk
 include $(CHIBIOS)/os/vfs/vfs_syscalls.mk
diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/cfg/sbconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/cfg/sbconf.h
index 82ee7603a..089aee3d1 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/cfg/sbconf.h
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY-SB_HOST_STATIC/cfg/sbconf.h
@@ -56,7 +56,7 @@
  * @brief   Enables support for sandbox Virtual HAL.
  */
 #if !defined(SB_CFG_ENABLE_VHAL) || defined(__DOXYGEN__)
-#define SB_CFG_ENABLE_VHAL                  TRUE
+#define SB_CFG_ENABLE_VHAL                  FALSE
 #endif
 
 /**