diff --git a/Makefile b/Makefile
index 063755de66..21218c8222 100644
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,7 @@ generate:
 	$(MAKE) format
 
 # Generate descriptors for supported ENI configurations.
+generate-limits: GOOS=
 generate-limits:
 	go run pkg/awsutils/gen_vpc_ip_limits.go
 
diff --git a/pkg/awsutils/gen_vpc_ip_limits.go b/pkg/awsutils/gen_vpc_ip_limits.go
index d4582a5725..62cd58e4ba 100644
--- a/pkg/awsutils/gen_vpc_ip_limits.go
+++ b/pkg/awsutils/gen_vpc_ip_limits.go
@@ -113,19 +113,29 @@ func addManualLimits(limitMap map[string]ENILimit) map[string]ENILimit {
 		{"cr1.8xlarge", 8, 30},
 		{"g4dn.metal", 15, 50},
 		{"hs1.8xlarge", 8, 30},
-		{"m6g.12xlarge", 8, 30},
-		{"m6g.16xlarge", 15, 50},
-		{"m6g.2xlarge", 4, 15},
-		{"m6g.4xlarge", 8, 30},
-		{"m6g.8xlarge", 8, 30},
-		{"m6g.large", 3, 10},
-		{"m6g.medium", 2, 4},
-		{"m6g.xlarge", 4, 15},
 		{"u-12tb1.metal", 5, 30},
 		{"u-18tb1.metal", 15, 50},
 		{"u-24tb1.metal", 15, 50},
 		{"u-6tb1.metal", 5, 30},
 		{"u-9tb1.metal", 5, 30},
+		{"c6g.medium", 2, 4},
+		{"c6g.large", 3, 10},
+		{"c6g.xlarge", 4, 15},
+		{"c6g.2xlarge", 4, 15},
+		{"c6g.4xlarge", 8, 30},
+		{"c6g.8xlarge", 8, 30},
+		{"c6g.12xlarge", 8, 30},
+		{"c6g.16xlarge", 15, 50},
+		{"c6g.metal", 15, 50},
+		{"r6g.medium", 2, 4},
+		{"r6g.large", 3, 10},
+		{"r6g.xlarge", 4, 15},
+		{"r6g.2xlarge", 4, 15},
+		{"r6g.4xlarge", 8, 30},
+		{"r6g.8xlarge", 8, 30},
+		{"r6g.12xlarge", 8, 30},
+		{"r6g.16xlarge", 15, 50},
+		{"r6g.metal", 15, 50},
 	}
 	for _, eniLimit := range manuallyAddedLimits {
 		limitMap[eniLimit.InstanceType] = newENILimit(eniLimit.InstanceType, eniLimit.ENILimit, eniLimit.IPLimit)
diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go
index 4c80a726e8..967ae1bcbd 100644
--- a/pkg/awsutils/vpc_ip_resource_limit.go
+++ b/pkg/awsutils/vpc_ip_resource_limit.go
@@ -12,7 +12,7 @@
 // permissions and limitations under the License.
 
 // Code generated by go generate; DO NOT EDIT.
-// This file was generated at 2020-04-15T12:17:19-07:00
+// This file was generated at 2020-05-27T13:49:37-07:00
 
 package awsutils
 
@@ -62,6 +62,15 @@ var InstanceENIsAvailable = map[string]int{
 	"c5n.large":     3,
 	"c5n.metal":     15,
 	"c5n.xlarge":    4,
+	"c6g.12xlarge":  8,
+	"c6g.16xlarge":  15,
+	"c6g.2xlarge":   4,
+	"c6g.4xlarge":   8,
+	"c6g.8xlarge":   8,
+	"c6g.large":     3,
+	"c6g.medium":    2,
+	"c6g.metal":     15,
+	"c6g.xlarge":    4,
 	"cc2.8xlarge":   8,
 	"cr1.8xlarge":   8,
 	"d2.2xlarge":    4,
@@ -186,6 +195,7 @@ var InstanceENIsAvailable = map[string]int{
 	"m6g.8xlarge":   8,
 	"m6g.large":     3,
 	"m6g.medium":    2,
+	"m6g.metal":     15,
 	"m6g.xlarge":    4,
 	"p2.16xlarge":   8,
 	"p2.8xlarge":    8,
@@ -255,6 +265,15 @@ var InstanceENIsAvailable = map[string]int{
 	"r5n.8xlarge":   8,
 	"r5n.large":     3,
 	"r5n.xlarge":    4,
+	"r6g.12xlarge":  8,
+	"r6g.16xlarge":  15,
+	"r6g.2xlarge":   4,
+	"r6g.4xlarge":   8,
+	"r6g.8xlarge":   8,
+	"r6g.large":     3,
+	"r6g.medium":    2,
+	"r6g.metal":     15,
+	"r6g.xlarge":    4,
 	"t1.micro":      2,
 	"t2.2xlarge":    3,
 	"t2.large":      3,
@@ -345,6 +364,15 @@ var InstanceIPsAvailable = map[string]int{
 	"c5n.large":     10,
 	"c5n.metal":     50,
 	"c5n.xlarge":    15,
+	"c6g.12xlarge":  30,
+	"c6g.16xlarge":  50,
+	"c6g.2xlarge":   15,
+	"c6g.4xlarge":   30,
+	"c6g.8xlarge":   30,
+	"c6g.large":     10,
+	"c6g.medium":    4,
+	"c6g.metal":     50,
+	"c6g.xlarge":    15,
 	"cc2.8xlarge":   30,
 	"cr1.8xlarge":   30,
 	"d2.2xlarge":    15,
@@ -469,6 +497,7 @@ var InstanceIPsAvailable = map[string]int{
 	"m6g.8xlarge":   30,
 	"m6g.large":     10,
 	"m6g.medium":    4,
+	"m6g.metal":     50,
 	"m6g.xlarge":    15,
 	"p2.16xlarge":   30,
 	"p2.8xlarge":    30,
@@ -538,6 +567,15 @@ var InstanceIPsAvailable = map[string]int{
 	"r5n.8xlarge":   30,
 	"r5n.large":     10,
 	"r5n.xlarge":    15,
+	"r6g.12xlarge":  30,
+	"r6g.16xlarge":  50,
+	"r6g.2xlarge":   15,
+	"r6g.4xlarge":   30,
+	"r6g.8xlarge":   30,
+	"r6g.large":     10,
+	"r6g.medium":    4,
+	"r6g.metal":     50,
+	"r6g.xlarge":    15,
 	"t1.micro":      2,
 	"t2.2xlarge":    15,
 	"t2.large":      12,