diff --git a/.gitmodules b/.gitmodules
index 6253d89b9..3412a6b58 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,6 +21,13 @@
 [submodule "vendor/fido2-tests"]
 	path = vendor/fido2-tests
 	url = https://github.com/trezor/fido2-tests.git
-[submodule "vendor/stm32cube-u5"]
-	path = vendor/stm32cube-u5
-	url = https://github.com/STMicroelectronics/STM32CubeU5.git
+[submodule "vendor/cmsis_device_u5"]
+	path = vendor/cmsis_device_u5
+	url = https://github.com/STMicroelectronics/cmsis_device_u5.git
+[submodule "vendor/cmsis_5"]
+	path = vendor/cmsis_5
+	url = https://github.com/ARM-software/CMSIS_5.git
+
+[submodule "vendor/stm32u5xx_hal_driver"]
+	path = vendor/stm32u5xx_hal_driver
+	url = https://github.com/trezor/stm32u5xx_hal_driver.git
diff --git a/core/site_scons/boards/discovery2.py b/core/site_scons/boards/discovery2.py
index e3924449f..5a7c2d32a 100644
--- a/core/site_scons/boards/discovery2.py
+++ b/core/site_scons/boards/discovery2.py
@@ -78,7 +78,7 @@ def configure(
             "embed/trezorhal/stm32u5/usbd_core.c",
             "embed/trezorhal/stm32u5/usbd_ctlreq.c",
             "embed/trezorhal/stm32u5/usbd_ioreq.c",
-            "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
+            "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c",
         ]
         features_available.append("usb")
 
diff --git a/core/site_scons/boards/stm32u5_common.py b/core/site_scons/boards/stm32u5_common.py
index f8450a415..67021e56b 100644
--- a/core/site_scons/boards/stm32u5_common.py
+++ b/core/site_scons/boards/stm32u5_common.py
@@ -9,37 +9,37 @@ def stm32u5_common_files(env, defines, sources, paths):
 
     paths += [
         "embed/trezorhal/stm32u5",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc",
-        "vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include",
-        "vendor/stm32cube-u5/Drivers/CMSIS/Core/Include",
+        "vendor/stm32u5xx_hal_driver/Inc",
+        "vendor/cmsis_device_u5/Include",
+        "vendor/cmsis_5/CMSIS/Core/Include",
     ]
 
     sources += [
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cortex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cryp.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dma2d.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dsi.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash_ex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gfxmmu.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gpio.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gtzc.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c_ex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_icache.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc_ex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd_ex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr_ex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc_ex.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rtc.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_spi.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_sram.c",
-        "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_fmc.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_cortex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_cryp.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_dma2d.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_dsi.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_flash.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_flash_ex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gfxmmu.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gpio.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gtzc.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_i2c.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_i2c_ex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_icache.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_ltdc.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_ltdc_ex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pcd.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pcd_ex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pwr.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pwr_ex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rcc.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rcc_ex.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rtc.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_spi.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_sram.c",
+        "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_fmc.c",
     ]
 
     sources += [
@@ -77,9 +77,9 @@ def stm32u5_common_files(env, defines, sources, paths):
 
     env.get("ENV")["RUST_INCLUDES"] = (
         "-I../trezorhal/stm32u5;"
-        "-I../../vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc;"
-        "-I../../vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include;"
-        "-I../../vendor/stm32cube-u5/Drivers/CMSIS/Core/Include;"
+        "-I../../vendor/stm32u5xx_hal_driver/Inc;"
+        "-I../../vendor/cmsis_device_u5/Include;"
+        "-I../../vendor/cmsis_5/CMSIS/Core/Include;"
         "-DSTM32_HAL_H=<stm32u5xx.h>;"
         "-DSTM32U5;"
         "-DFLASH_BLOCK_WORDS=4"
diff --git a/core/site_scons/boards/trezor_t3t1_v4.py b/core/site_scons/boards/trezor_t3t1_v4.py
index 90ee275ad..7e18d2586 100644
--- a/core/site_scons/boards/trezor_t3t1_v4.py
+++ b/core/site_scons/boards/trezor_t3t1_v4.py
@@ -57,8 +57,8 @@ def configure(
             "embed/trezorhal/stm32u5/haptic/drv2625/drv2625.c",
         ]
         sources += [
-            "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim.c",
-            "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim_ex.c",
+            "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_tim.c",
+            "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_tim_ex.c",
         ]
         features_available.append("haptic")
 
@@ -68,9 +68,7 @@ def configure(
         sources += ["embed/extmod/modtrezorio/ff.c"]
         sources += ["embed/extmod/modtrezorio/ffunicode.c"]
         features_available.append("sd_card")
-        sources += [
-            "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_sdmmc.c"
-        ]
+        sources += ["vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_sdmmc.c"]
 
     if "sbu" in features_wanted:
         sources += ["embed/trezorhal/stm32u5/sbu.c"]
@@ -83,7 +81,7 @@ def configure(
             "embed/trezorhal/stm32u5/usbd_core.c",
             "embed/trezorhal/stm32u5/usbd_ctlreq.c",
             "embed/trezorhal/stm32u5/usbd_ioreq.c",
-            "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
+            "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c",
         ]
         features_available.append("usb")
 
diff --git a/core/vendor/stm32cube-u5 b/core/vendor/stm32cube-u5
deleted file mode 120000
index 60475d6a3..000000000
--- a/core/vendor/stm32cube-u5
+++ /dev/null
@@ -1 +0,0 @@
-../../vendor/stm32cube-u5
\ No newline at end of file
diff --git a/core/vendor/stm32u5xx_hal_driver b/core/vendor/stm32u5xx_hal_driver
new file mode 120000
index 000000000..f481ba54e
--- /dev/null
+++ b/core/vendor/stm32u5xx_hal_driver
@@ -0,0 +1 @@
+../../vendor/stm32u5xx_hal_driver/
\ No newline at end of file
diff --git a/vendor/cmsis_5 b/vendor/cmsis_5
new file mode 160000
index 000000000..a75f01746
--- /dev/null
+++ b/vendor/cmsis_5
@@ -0,0 +1 @@
+Subproject commit a75f01746df18bb5b929dfb8dc6c9407fac3a0f3
diff --git a/vendor/cmsis_device_u5 b/vendor/cmsis_device_u5
new file mode 160000
index 000000000..f439f9687
--- /dev/null
+++ b/vendor/cmsis_device_u5
@@ -0,0 +1 @@
+Subproject commit f439f9687257f8e69daccb8dc6c4d1ed8dab73aa
diff --git a/vendor/stm32cube-u5 b/vendor/stm32cube-u5
deleted file mode 160000
index 7942fc4ea..000000000
--- a/vendor/stm32cube-u5
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7942fc4ea05026e4e9ce72d680f704e9433bce42
diff --git a/vendor/stm32u5xx_hal_driver b/vendor/stm32u5xx_hal_driver
new file mode 160000
index 000000000..270974ea8
--- /dev/null
+++ b/vendor/stm32u5xx_hal_driver
@@ -0,0 +1 @@
+Subproject commit 270974ea816779656ac8bb183344ac017e693677