diff --git a/src/lwip/qpg6100/lwipopts.h b/src/lwip/qpg6100/lwipopts.h
index 13d971951dba89..bb0aa2ff4a376a 100644
--- a/src/lwip/qpg6100/lwipopts.h
+++ b/src/lwip/qpg6100/lwipopts.h
@@ -50,16 +50,25 @@
 
 #define LWIP_SOCKET 0
 
-// TODO: seems like this is unnecessary on Thread-only platforms
+#ifdef INET_CONFIG_ENABLE_RAW_ENDPOINT
 #define LWIP_RAW 1
 #define MEMP_NUM_RAW_PCB (5)
+#else
+#define LWIP_RAW 0
+#define MEMP_NUM_RAW_PCB 0
+#endif //INET_CONFIG_ENABLE_RAW_ENDPOINT
+#ifdef INET_CONFIG_ENABLE_TCP_ENDPOINT
+#define LWIP_TCP 1
+#else
+#define LWIP_TCP 0
+#define MEMP_NUM_TCP_PCB 0
+#endif //INET_CONFIG_ENABLE_TCP_ENDPOINT
 
 // TODO: verify count
 #define MEMP_NUM_UDP_PCB (7)
 
-#define LWIP_HAVE_LOOPIF (0)
-
 // TODO: not sure why this is disabled
+#define LWIP_HAVE_LOOPIF (0)
 #define LWIP_NETIF_LOOPBACK (0)
 
 #define MEMP_NUM_NETCONN (0)
diff --git a/src/platform/qpg6100/args.gni b/src/platform/qpg6100/args.gni
index 25559526f38c62..251a4eaaba431d 100644
--- a/src/platform/qpg6100/args.gni
+++ b/src/platform/qpg6100/args.gni
@@ -29,6 +29,12 @@ lwip_api = true
 
 chip_inet_config_enable_ipv4 = false
 chip_inet_config_enable_dns_resolver = false
+chip_inet_config_enable_tcp_endpoint = false
+chip_inet_config_enable_raw_endpoint = false
+
+# Size opt's
+#chip_progress_logging = false
+chip_detail_logging = false
 
 chip_build_tests = false
 
diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo
index c5377b6338bf46..3b185db0b4697b 160000
--- a/third_party/qpg_sdk/repo
+++ b/third_party/qpg_sdk/repo
@@ -1 +1 @@
-Subproject commit c5377b6338bf464793bc693d7a1d6bf4aaa71955
+Subproject commit 3b185db0b4697b9bb15683f7faadd4d8d0d11c2f