diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
index fb7c602527fea5..76db456fda3999 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
@@ -39,7 +39,7 @@
 #include <ti/drivers/SHA2.h>
 
 #include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc000)
+#define TOTAL_ICALL_HEAP_SIZE (0xE000)
 
 using namespace ::chip;
 using namespace ::chip::Inet;
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
index fb7c602527fea5..76db456fda3999 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
@@ -39,7 +39,7 @@
 #include <ti/drivers/SHA2.h>
 
 #include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc000)
+#define TOTAL_ICALL_HEAP_SIZE (0xE000)
 
 using namespace ::chip;
 using namespace ::chip::Inet;
diff --git a/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h b/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h
index 26a1537fe9c178..45398c4cfa9a73 100644
--- a/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h
+++ b/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h
@@ -39,7 +39,7 @@
 
 // ========== CHIP Platform Configuration =========
 
-#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (6144)
+#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (8192)
 
 #define BLEMANAGER_EVENT_HANDLER_STACK_SIZE (4096)
 #define BLEMANAGER_EVENT_HANDLER_PRIORITY (2)
diff --git a/src/platform/cc13x2_26x2/CHIPPlatformConfig.h b/src/platform/cc13x2_26x2/CHIPPlatformConfig.h
index 08c4c4039cc14f..a4a57469d90c5a 100644
--- a/src/platform/cc13x2_26x2/CHIPPlatformConfig.h
+++ b/src/platform/cc13x2_26x2/CHIPPlatformConfig.h
@@ -109,6 +109,11 @@
 #define CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS 4
 #endif // CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS
 
+// Limit the number of device admins to ensure enough ressources for handling them
+#ifndef CHIP_CONFIG_MAX_DEVICE_ADMINS
+#define CHIP_CONFIG_MAX_DEVICE_ADMINS 5
+#endif // CHIP_CONFIG_MAX_DEVICE_ADMINS
+
 // ==================== Security Configuration Overrides ====================
 
 #ifndef CHIP_CONFIG_MAX_APPLICATION_GROUPS