diff --git a/components/bt/lib b/components/bt/lib
index 3f564c30f0..18363e9395 160000
--- a/components/bt/lib
+++ b/components/bt/lib
@@ -1 +1 @@
-Subproject commit 3f564c30f0b0a8cd7fbc0064f7d97db1c08bb0e8
+Subproject commit 18363e9395a2f28473dce38a206c18d62850c67a
diff --git a/components/bt/test/test_bt_common.c b/components/bt/test/test_bt_common.c
new file mode 100644
index 0000000000..681876022c
--- /dev/null
+++ b/components/bt/test/test_bt_common.c
@@ -0,0 +1,14 @@
+/*
+ Tests for the BT common things implementation
+*/
+
+#include <stdbool.h>
+
+#include "unity.h"
+
+extern bool btdm_controller_compile_version_check(void);
+
+TEST_CASE("bt_controller_git_commit_check", "[bt_common]")
+{
+    TEST_ASSERT(btdm_controller_compile_version_check() == true);
+}
diff --git a/components/esp32/lib b/components/esp32/lib
index 912dedb942..b957828199 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 912dedb9420e936e44fe5f34f7e9ae06909bafd7
+Subproject commit b9578281990fea536f05d1a6d511c323cedfc50a