diff --git a/boards/arm/atsamr21_xpro/atsamr21_xpro.yaml b/boards/arm/atsamr21_xpro/atsamr21_xpro.yaml
index 7de55936bca..c2d0c19bca2 100644
--- a/boards/arm/atsamr21_xpro/atsamr21_xpro.yaml
+++ b/boards/arm/atsamr21_xpro/atsamr21_xpro.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Gerson Fernando Budke
+# Copyright (c) 2019-2020 Gerson Fernando Budke
 # Copyright (c) 2019 Benjamin Valentin
 # SPDX-License-Identifier: Apache-2.0
 identifier: atsamr21_xpro
@@ -15,6 +15,7 @@ supported:
   - gpio
   - i2c
   - ieee802154
+  - netif
   - pwm
   - spi
   - usb_device
diff --git a/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf b/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf
index 87830b3974d..022fc5b2e6a 100644
--- a/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf
+++ b/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf
@@ -10,16 +10,16 @@ CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="RF2XX_0"
 # Reduced buffers to fit into SAMR21 SoC
 CONFIG_CPLUSPLUS=n
 
-CONFIG_NET_PKT_RX_COUNT=8
-CONFIG_NET_PKT_TX_COUNT=8
-CONFIG_NET_BUF_RX_COUNT=8
-CONFIG_NET_BUF_TX_COUNT=8
+CONFIG_NET_PKT_RX_COUNT=6
+CONFIG_NET_PKT_TX_COUNT=6
+CONFIG_NET_BUF_RX_COUNT=6
+CONFIG_NET_BUF_TX_COUNT=6
 CONFIG_NET_MAX_CONTEXTS=4
 CONFIG_NET_MAX_CONN=2
-CONFIG_NET_MAX_ROUTES=4
+CONFIG_NET_MAX_ROUTES=2
 CONFIG_NET_MAX_NEXTHOPS=2
 
 CONFIG_SHELL_STACK_SIZE=768
 CONFIG_SHELL_CMD_BUFF_SIZE=80
 CONFIG_SHELL_ARGC_MAX=6
-CONFIG_SHELL_HISTORY_BUFFER=128
+CONFIG_SHELL_HISTORY_BUFFER=64
diff --git a/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf b/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf
index 87830b3974d..022fc5b2e6a 100644
--- a/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf
+++ b/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf
@@ -10,16 +10,16 @@ CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="RF2XX_0"
 # Reduced buffers to fit into SAMR21 SoC
 CONFIG_CPLUSPLUS=n
 
-CONFIG_NET_PKT_RX_COUNT=8
-CONFIG_NET_PKT_TX_COUNT=8
-CONFIG_NET_BUF_RX_COUNT=8
-CONFIG_NET_BUF_TX_COUNT=8
+CONFIG_NET_PKT_RX_COUNT=6
+CONFIG_NET_PKT_TX_COUNT=6
+CONFIG_NET_BUF_RX_COUNT=6
+CONFIG_NET_BUF_TX_COUNT=6
 CONFIG_NET_MAX_CONTEXTS=4
 CONFIG_NET_MAX_CONN=2
-CONFIG_NET_MAX_ROUTES=4
+CONFIG_NET_MAX_ROUTES=2
 CONFIG_NET_MAX_NEXTHOPS=2
 
 CONFIG_SHELL_STACK_SIZE=768
 CONFIG_SHELL_CMD_BUFF_SIZE=80
 CONFIG_SHELL_ARGC_MAX=6
-CONFIG_SHELL_HISTORY_BUFFER=128
+CONFIG_SHELL_HISTORY_BUFFER=64