diff --git a/port/samv71-xplained-atwilc3000/btstack_config.h b/port/samv71-xplained-atwilc3000/btstack_config.h
index a5c43bcac..3f7dd9240 100644
--- a/port/samv71-xplained-atwilc3000/btstack_config.h
+++ b/port/samv71-xplained-atwilc3000/btstack_config.h
@@ -20,17 +20,29 @@
 #define HCI_ACL_PAYLOAD_SIZE 1021
 
 // memory config
-#define MAX_NR_HCI_CONNECTIONS 1
-#define MAX_NR_L2CAP_SERVICES  3
-#define MAX_NR_L2CAP_CHANNELS  4
-#define MAX_NR_RFCOMM_MULTIPLEXERS 1
-#define MAX_NR_RFCOMM_SERVICES 2
-#define MAX_NR_RFCOMM_CHANNELS 1
+#define MAX_NR_AVDTP_CONNECTIONS 1
+#define MAX_NR_AVDTP_STREAM_ENDPOINTS 1
+#define MAX_NR_AVRCP_CONNECTIONS 1
+#define MAX_NR_BNEP_CHANNELS 1
+#define MAX_NR_BNEP_SERVICES 1
+#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES  2
 #define MAX_NR_DB_MEM_DEVICE_LINK_KEYS  2
 #define MAX_NR_DB_MEM_SERVICES 1
-#define MAX_NR_SM_LOOKUP_ENTRIES 1
-#define MAX_NR_SERVICE_RECORD_ITEMS 2
+#define MAX_NR_GATT_CLIENTS 1
+#define MAX_NR_GATT_SUBCLIENTS 1
+#define MAX_NR_HCI_CONNECTIONS 1
+#define MAX_NR_HFP_CONNECTIONS 1
+#define MAX_NR_L2CAP_CHANNELS  4
+#define MAX_NR_L2CAP_SERVICES  3
 #define MAX_NR_LE_DEVICE_DB_ENTRIES 1
+#define MAX_NR_LE_DEVICE_DB_ENTRIES 1
+#define MAX_NR_RFCOMM_CHANNELS 1
+#define MAX_NR_RFCOMM_MULTIPLEXERS 1
+#define MAX_NR_RFCOMM_SERVICES 2
+#define MAX_NR_SERVICE_RECORD_ITEMS 2
+#define MAX_NR_SM_LOOKUP_ENTRIES 1
+#define MAX_NR_WHITELIST_ENTRIES 1
+
 
 #endif
 
diff --git a/port/samv71-xplained-atwilc3000/example/template/config.mk b/port/samv71-xplained-atwilc3000/example/template/config.mk
index 0816f5c24..27b4080af 100644
--- a/port/samv71-xplained-atwilc3000/example/template/config.mk
+++ b/port/samv71-xplained-atwilc3000/example/template/config.mk
@@ -176,6 +176,7 @@ CSRCS += \
 	${BTSTACK_ROOT}/src/classic/hfp_gsm_model.c \
 	${BTSTACK_ROOT}/src/classic/hsp_hs.c \
 	${BTSTACK_ROOT}/src/classic/hsp_ag.c \
+	${BTSTACK_ROOT}/src/classic/btstack_link_key_db_memory.c \
 	${BTSTACK_ROOT}/src/classic/goep_client.c \
 	${BTSTACK_ROOT}/src/classic/obex_iterator.c \
 	${BTSTACK_ROOT}/src/classic/pbap_client.c \
diff --git a/port/samv71-xplained-atwilc3000/main.c b/port/samv71-xplained-atwilc3000/main.c
index 7dd1b1214..cac651b0a 100644
--- a/port/samv71-xplained-atwilc3000/main.c
+++ b/port/samv71-xplained-atwilc3000/main.c
@@ -1,3 +1,5 @@
+#define __BTSTACK_FILE__ "main.c"
+
 #include "asf.h"
 #include "stdio_serial.h"
 #include "conf_board.h"
@@ -529,10 +531,9 @@ static void phase2(int status){
 
     // init HCI
     const hci_transport_t * transport = hci_transport_h4_instance(uart_driver);
-    // const btstack_link_key_db_t * link_key_db = btstack_link_key_db_fs_instance();
     hci_init(transport, (void*) &transport_config);
     hci_set_chipset(btstack_chipset_atwilc3000_instance());
-    // hci_set_link_key_db(link_key_db);
+    hci_set_link_key_db(btstack_link_key_db_memory_instance());
     
     // setup app
     btstack_main(0, NULL);
@@ -568,7 +569,7 @@ int main(void)
 	btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
 
 	// enable full log output while porting
-	hci_dump_open(NULL, HCI_DUMP_STDOUT);
+	// hci_dump_open(NULL, HCI_DUMP_STDOUT);
 
 	// setup UART HAL + Run Loop integration
 	uart_driver = btstack_uart_block_embedded_instance();