diff --git a/manifests/nabucasa/skyconnect_zigbee_ncp.yaml b/manifests/nabucasa/skyconnect_zigbee_ncp.yaml
index 8cdb1b7a..5eb825eb 100644
--- a/manifests/nabucasa/skyconnect_zigbee_ncp.yaml
+++ b/manifests/nabucasa/skyconnect_zigbee_ncp.yaml
@@ -11,22 +11,20 @@ gbl:
   baudrate: 115200
 
 configuration:
-  SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
-  SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts
-
-  SL_CLI_MAX_INPUT_ARGUMENTS: 16
-  EMBER_AF_PLUGIN_ZIGBEE_PRO_STACK_CHILD_TABLE_SIZE: 32
+  EMBER_CHILD_TABLE_SIZE: 32
 
 c_defines:
+  EMBER_APS_UNICAST_MESSAGE_COUNT: 32
   EMBER_BINDING_TABLE_SIZE: 32
+  EMBER_BROADCAST_TABLE_SIZE: 64
+  EMBER_KEY_TABLE_SIZE: 12
   EMBER_MAX_END_DEVICE_CHILDREN: 32
   EMBER_PACKET_BUFFER_COUNT: 255
-  EMBER_KEY_TABLE_SIZE: 12
-
-  EMBER_APS_UNICAST_MESSAGE_COUNT: 32
-  EMBER_BROADCAST_TABLE_SIZE: 64
   EMBER_SOURCE_ROUTE_TABLE_SIZE: 200
 
+  SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
+  SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts
+
   SL_IOSTREAM_USART_VCOM_PERIPHERAL: USART0
   SL_IOSTREAM_USART_VCOM_PERIPHERAL_NO: 0
 
diff --git a/manifests/nabucasa/yellow_zigbee_ncp.yaml b/manifests/nabucasa/yellow_zigbee_ncp.yaml
index 3ca0b0b0..b7957400 100644
--- a/manifests/nabucasa/yellow_zigbee_ncp.yaml
+++ b/manifests/nabucasa/yellow_zigbee_ncp.yaml
@@ -15,23 +15,21 @@ add_components:
   instance: [board_activity]
 
 configuration:
-  SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
-  SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts
-
-  SL_CLI_MAX_INPUT_ARGUMENTS: 16
-  EMBER_AF_PLUGIN_ZIGBEE_PRO_STACK_CHILD_TABLE_SIZE: 32
+  EMBER_CHILD_TABLE_SIZE: 32
 
 c_defines:
+  EMBER_APS_UNICAST_MESSAGE_COUNT: 32
   EMBER_BINDING_TABLE_SIZE: 32
+  EMBER_BROADCAST_TABLE_SIZE: 64
+  EMBER_KEY_TABLE_SIZE: 12
   EMBER_MAX_END_DEVICE_CHILDREN: 32
   EMBER_PACKET_BUFFER_COUNT: 255
-  EMBER_KEY_TABLE_SIZE: 12
-
-  EMBER_APS_UNICAST_MESSAGE_COUNT: 32
-  EMBER_BROADCAST_TABLE_SIZE: 64
   EMBER_SOURCE_ROUTE_TABLE_SIZE: 200
 
-  SL_IOSTREAM_USART_VCOM_PERIPHERAL:    USART0
+  SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
+  SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts
+
+  SL_IOSTREAM_USART_VCOM_PERIPHERAL: USART0
   SL_IOSTREAM_USART_VCOM_PERIPHERAL_NO: 0
 
   SL_IOSTREAM_USART_VCOM_TX_PORT: gpioPortA
diff --git a/src/zigbee_ncp/zigbee_ncp.slcp b/src/zigbee_ncp/zigbee_ncp.slcp
index 943c318b..22042a47 100644
--- a/src/zigbee_ncp/zigbee_ncp.slcp
+++ b/src/zigbee_ncp/zigbee_ncp.slcp
@@ -26,7 +26,13 @@ component:
   - id: zigbee_debug_basic
   - id: zigbee_debug_extended
 
+define:
+  - name: EMBER_CUSTOM_MAC_FILTER_TABLE_SIZE
+    value: 15
+
 configuration:
+  - name: SL_CLI_MAX_INPUT_ARGUMENTS
+    value: 16
   - name: SL_BOARD_ENABLE_VCOM
     value: 1
   - name: SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE
diff --git a/tools/build_project.py b/tools/build_project.py
index a7037281..d8cf744c 100755
--- a/tools/build_project.py
+++ b/tools/build_project.py
@@ -389,7 +389,6 @@ def main():
             "--project-file", base_project_slcp.resolve(),
             "--export-destination", args.build_dir.resolve(),
             "--copy-proj-sources",
-            "--copy-sdk-sources",
             "--new-project",
             "--toolchain", "toolchain_gcc",
             "--sdk", sdk,