diff --git a/src/graph/connect.cc b/src/graph/connect.cc
index 6c681c397b..3284072466 100644
--- a/src/graph/connect.cc
+++ b/src/graph/connect.cc
@@ -626,7 +626,7 @@ ncclResult_t ncclTopoPostset(struct ncclComm* comm, int* firstRanks, int* treePa
 
   // Only use full MAXCHANNELS for gfx94x
   int maxChannels = IsArchMatch(comm->topo->nodes[GPU].nodes[0].gpu.gcn, "gfx94") ?
-    ((comm->topo->nodes[GPU].nodes[0].gpu.cu == 80 || comm->topo->nodes[GPU].nodes[0].gpu.cu == 20)
+    ((comm->topo->nodes[GPU].nodes[0].gpu.cu == 80 || comm->topo->nodes[GPU].nodes[0].gpu.cu == 20 || comm->topo->nodes[GPU].nodes[0].gpu.cu == 38)
       ? comm->topo->nodes[GPU].nodes[0].gpu.cu : MAXCHANNELS) : 2*CHANNEL_LIMIT;
 
   if (graphs[NCCL_ALGO_RING]->nIntraChannels > 0 || comm->nNodes > 1) {
diff --git a/src/graph/topo.h b/src/graph/topo.h
index 53028480e9..dd8ae542ea 100644
--- a/src/graph/topo.h
+++ b/src/graph/topo.h
@@ -94,7 +94,7 @@ struct ncclTopoLink {
   float bw;
   struct ncclTopoNode* remNode;
 };
-#define NCCL_TOPO_MAX_LINKS 64	//Changed the value from 32 to 64 for CPX mode
+#define NCCL_TOPO_MAX_LINKS 128	//Changed the value from 32 to 128 for CPX mode
 
 #define NCCL_TOPO_MAX_HOPS (NCCL_TOPO_MAX_NODES*NCCL_TOPO_NODE_TYPES)
 
diff --git a/src/graph/xml.h b/src/graph/xml.h
index 95baba677c..739dc19c1d 100644
--- a/src/graph/xml.h
+++ b/src/graph/xml.h
@@ -17,8 +17,8 @@
 // A few constraints to make the implementation easy
 #define MAX_STR_LEN 255
 #define MAX_ATTR_COUNT 16
-#define MAX_SUBS 64	//Changed the value from 32 to 64 for CPX mode
-#define MAX_NODES 4096 //Changed the value from 1024 to 4096 for CPX mode
+#define MAX_SUBS 512	//Changed the value from 32 to 512 for CPX mode
+#define MAX_NODES 8192 //Changed the value from 1024 to 8192 for CPX mode
 
 #define NODE_TYPE_NONE 0
 #define NODE_TYPE_OPEN 1