diff --git a/main/include/OpenThreadConfig.h b/main/include/OpenThreadConfig.h
index badf22f7..f97df908 100644
--- a/main/include/OpenThreadConfig.h
+++ b/main/include/OpenThreadConfig.h
@@ -25,6 +25,8 @@
 #ifndef OPENTHREAD_PLATFORM_CONFIG_H
 #define OPENTHREAD_PLATFORM_CONFIG_H
 
+#include "ble_config.h"
+
 // Disable the Nordic-supplied OpenThread logging facilities and use
 // the facilities provided by the OpenWeave Device Layer (see
 // openweave/src/adaptations/device-layer/nRF5/Logging.cpp).
@@ -66,7 +68,7 @@
 #define OPENTHREAD_CONFIG_MLE_UNICAST_RETRANSMISSION_DELAY 1500
 #define OPENTHREAD_CONFIG_MLE_CHILD_ID_REQUEST_TIMEOUT 10000
 
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
+#define OPENTHREAD_CONFIG_NORDIC_BLE_CFG_TAG NRF_BLE_CFG_TAG
 
 
+#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/main/include/WeaveProjectConfig.h b/main/include/WeaveProjectConfig.h
index d2ae7f70..44018619 100644
--- a/main/include/WeaveProjectConfig.h
+++ b/main/include/WeaveProjectConfig.h
@@ -28,6 +28,9 @@
 #ifndef WEAVE_PROJECT_CONFIG_H
 #define WEAVE_PROJECT_CONFIG_H
 
+#include "ble_config.h"
+
+
 #define WEAVE_PROGRESS_LOGGING 1
 
 /**
@@ -148,4 +151,12 @@
  */
 #define WEAVE_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE nl::Weave::Profiles::DataManagement::Debug
 
+/**
+ * WEAVE_DEVICE_LAYER_BLE_CONN_CFG_TAG
+ *
+ * The SoftDevice BLE connection configuration tag must be the same
+ * across both OpenWeave and OpenThread.
+ */
+#define WEAVE_DEVICE_LAYER_BLE_CONN_CFG_TAG NRF_BLE_CFG_TAG
+
 #endif // WEAVE_PROJECT_CONFIG_H
diff --git a/main/include/ble_config.h b/main/include/ble_config.h
new file mode 100644
index 00000000..f5f9781e
--- /dev/null
+++ b/main/include/ble_config.h
@@ -0,0 +1,26 @@
+/*
+ *
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef BLE_CONFIG_H
+#define BLE_CONFIG_H
+
+// ---- BLE Config ----
+#define NRF_BLE_CFG_TAG							1
+
+
+#endif // BLE_CONFIG_H
\ No newline at end of file
diff --git a/third_party/openthread b/third_party/openthread
index 78f06027..ee324892 160000
--- a/third_party/openthread
+++ b/third_party/openthread
@@ -1 +1 @@
-Subproject commit 78f06027f21fdcd3710e6bf95d4da44cc2077cc3
+Subproject commit ee32489254f4aeed52886994fefbbb0a5bc174e3
diff --git a/third_party/openweave-core b/third_party/openweave-core
index b513692f..05ffe019 160000
--- a/third_party/openweave-core
+++ b/third_party/openweave-core
@@ -1 +1 @@
-Subproject commit b513692fb1b5eadb9903faf38ebf2ae7b5a9eed4
+Subproject commit 05ffe0199222812ae4bcfbd15a4df6805ce3ee2d