diff --git a/app/boards/nrf5340dk_nrf5340_cpuapp.conf b/app/boards/nrf5340dk_nrf5340_cpuapp.conf
index a40195e3..ccb0ddba 100644
--- a/app/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/app/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -11,5 +11,6 @@ CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 
-# Default main stack size is too small for HCI RPMsg
+# Default main and BLE stack sizes are too small for HCI RPMsg
 CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZMK_BLE_THREAD_STACK_SIZE=1024
diff --git a/app/boards/nrf5340dk_nrf5340_cpuapp.overlay b/app/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000..66d2332f
--- /dev/null
+++ b/app/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+&arduino_i2c {
+    // Default buffer size is too small for use with displays.
+    zephyr,concat-buf-size = <512>;
+};