diff --git a/include/rdc/rdc.h b/include/rdc/rdc.h
index 3370e49bce..26beae9411 100644
--- a/include/rdc/rdc.h
+++ b/include/rdc/rdc.h
@@ -124,7 +124,7 @@ typedef enum { INTEGER = 0, DOUBLE, STRING, BLOB } rdc_field_type_t;
 /**
  * @brief Max number of GPUs supported by RDC
  */
-#define RDC_MAX_NUM_DEVICES 16
+#define RDC_MAX_NUM_DEVICES 128
 
 /**
  * @brief The max fields in a field group
diff --git a/python_binding/rdc_bootstrap.py b/python_binding/rdc_bootstrap.py
index 25ef27e1df..de0a982516 100644
--- a/python_binding/rdc_bootstrap.py
+++ b/python_binding/rdc_bootstrap.py
@@ -33,7 +33,7 @@ RDC_GROUP_ALL_GPUS = -1000
 RDC_JOB_STATS_FIELDS = -1000
 RDC_MAX_STR_LENGTH = 256
 RDC_GROUP_MAX_ENTITIES = 64
-RDC_MAX_NUM_DEVICES = 16
+RDC_MAX_NUM_DEVICES = 128
 RDC_MAX_FIELD_IDS_PER_FIELD_GROUP = 128
 RDC_MAX_NUM_GROUPS = 64
 RDC_MAX_NUM_FIELD_GROUPS = 64