diff --git a/cmake/targets/ESP32S3_BZM_TFT35_GT911.cmake b/cmake/targets/ESP32S3_BZM_TFT35_GT911.cmake
index 94f00f84..b3c3be6c 100644
--- a/cmake/targets/ESP32S3_BZM_TFT35_GT911.cmake
+++ b/cmake/targets/ESP32S3_BZM_TFT35_GT911.cmake
@@ -5,10 +5,10 @@ if(ESP32S3_BZM_TFT35_GT911)
     set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_BZM_TFT35_GT911/sdkconfig)
     list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_BZM_TFT35_GT911/components)
     add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_BZM_TFT35_GT911/components/bsp")
+    # Add specific usb driver for otg
+    list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     if (USB_SERIAL_SERVICE)
         # Enable USB-OTG as serial alternative for communications
         add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
-        # Add specific usb driver for otg
-        list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     endif()
 endif()
\ No newline at end of file
diff --git a/cmake/targets/ESP32S3_CUSTOM.cmake b/cmake/targets/ESP32S3_CUSTOM.cmake
index 74565ea4..2efd38fb 100644
--- a/cmake/targets/ESP32S3_CUSTOM.cmake
+++ b/cmake/targets/ESP32S3_CUSTOM.cmake
@@ -2,11 +2,11 @@ if(ESP32S3_CUSTOM)
     set(TFT_TARGET "ESP32S3_CUSTOM")
     set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/sdkconfig)
     list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/components)
-    add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/components/bsp")    
+    add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/components/bsp")
+    # Add specific usb driver for otg
+    list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)    
     if (USB_SERIAL_SERVICE)
         # Enable USB-OTG as serial alternative for communications
         add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
-        # Add specific usb driver for otg
-        list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     endif()
 endif()
\ No newline at end of file
diff --git a/cmake/targets/ESP32S3_FREENOVE_1_1.cmake b/cmake/targets/ESP32S3_FREENOVE_1_1.cmake
index f1093efe..b464fbcd 100644
--- a/cmake/targets/ESP32S3_FREENOVE_1_1.cmake
+++ b/cmake/targets/ESP32S3_FREENOVE_1_1.cmake
@@ -2,12 +2,12 @@ if(ESP32S3_FREENOVE_1_1)
     set(TFT_TARGET "ESP32S3_FREENOVE_1_1")
     set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/sdkconfig)
     list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/components)
-    add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/components/bsp")    
+    add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/components/bsp")  
+    # Add specific usb driver for otg
+    list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)  
     if (USB_SERIAL_SERVICE)
         # Enable USB-OTG as serial alternative for communications
         add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
-        # Add specific usb driver for otg
-        list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     endif()
     unset(TFT_UI_SERVICE CACHE)
 endif()
\ No newline at end of file
diff --git a/cmake/targets/ESP32S3_HMI43V3.cmake b/cmake/targets/ESP32S3_HMI43V3.cmake
index 2be82a6c..4c22e436 100644
--- a/cmake/targets/ESP32S3_HMI43V3.cmake
+++ b/cmake/targets/ESP32S3_HMI43V3.cmake
@@ -10,10 +10,10 @@ if(ESP32S3_HMI43V3)
     list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_video_i80)
     # Add specific bsp path for board definition 
     add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_HMI43V3/components/bsp")
+    # Add specific usb driver for otg
+    list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     if (USB_SERIAL_SERVICE)
         # Enable USB-OTG as serial alternative for communications
         add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
-        # Add specific usb driver for otg
-        list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     endif()
 endif()
\ No newline at end of file
diff --git a/cmake/targets/ESP32S3_SEEED_STUDIO_XIAO.cmake b/cmake/targets/ESP32S3_SEEED_STUDIO_XIAO.cmake
index a6e985ce..a1febdcb 100644
--- a/cmake/targets/ESP32S3_SEEED_STUDIO_XIAO.cmake
+++ b/cmake/targets/ESP32S3_SEEED_STUDIO_XIAO.cmake
@@ -3,11 +3,11 @@ if(ESP32S3_SEEED_STUDIO_XIAO)
     set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_SEEED_STUDIO_XIAO/sdkconfig)
     list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_SEEED_STUDIO_XIAO/components)
     add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_SEEED_STUDIO_XIAO/components/bsp")    
+    # Add specific usb driver for otg
+    list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     if (USB_SERIAL_SERVICE)
         # Enable USB-OTG as serial alternative for communications
         add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
-        # Add specific usb driver for otg
-        list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
     endif()
     unset(TFT_UI_SERVICE CACHE)
 endif()
\ No newline at end of file