diff --git a/.gitmodules b/.gitmodules
index f0e9fc77..a827177b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "third_party/zephyr_bluetooth-2.7.5/zephyr_bluetooth"]
 	path = third_party/zephyr_bluetooth-2.7.5/zephyr_bluetooth
 	url = git@github.com:sakumisu/zephyr_bluetooth.git
+[submodule "third_party/nimble-1.6.0/nimble"]
+	path = third_party/nimble-1.6.0/nimble
+	url = git@github.com:sakumisu/mynewt-nimble.git
diff --git a/SConscript b/SConscript
index 483ea26e..9f2a89db 100644
--- a/SConscript
+++ b/SConscript
@@ -138,9 +138,6 @@ if GetDepend(['PKG_CHERRYUSB_HOST']):
     if GetDepend('RT_USING_DFS'):
         src += Glob('third_party/rt-thread-5.0/dfs_usbh_msc.c')
 
-    if GetDepend('PKG_USING_NIMBLE'):
-        src += Glob('third_party/nimble-latest/ble_hci_usbh.c')
-
 src += Glob('third_party/rt-thread-5.0/msh_cmd.c')
 
 group = DefineGroup('CherryUSB', src, depend = ['PKG_USING_CHERRYUSB'], CPPPATH = path, CPPDEFINES = CPPDEFINES)
diff --git a/third_party/nimble-1.6.0/nimble b/third_party/nimble-1.6.0/nimble
new file mode 160000
index 00000000..4d192d12
--- /dev/null
+++ b/third_party/nimble-1.6.0/nimble
@@ -0,0 +1 @@
+Subproject commit 4d192d129ea7f1c58c3f735d2e8db85faed2503c