diff --git a/client/fingerprint/env_aws_cpu.go b/client/fingerprint/env_aws_cpu.go
index cfc5b2c04..8131fe382 100644
--- a/client/fingerprint/env_aws_cpu.go
+++ b/client/fingerprint/env_aws_cpu.go
@@ -122,6 +122,16 @@ var instanceTypeCPU = map[string]CPU{
 	"d2.4xlarge":    newCPU(16, 2.4),
 	"d2.8xlarge":    newCPU(36, 2.4),
 	"d2.xlarge":     newCPU(4, 2.4),
+	"d3.2xlarge":    newCPU(8, 3.1),
+	"d3.4xlarge":    newCPU(16, 3.1),
+	"d3.8xlarge":    newCPU(32, 3.1),
+	"d3.xlarge":     newCPU(4, 3.1),
+	"d3en.12xlarge": newCPU(48, 3.1),
+	"d3en.2xlarge":  newCPU(8, 3.1),
+	"d3en.4xlarge":  newCPU(16, 3.1),
+	"d3en.6xlarge":  newCPU(24, 3.1),
+	"d3en.8xlarge":  newCPU(32, 3.1),
+	"d3en.xlarge":   newCPU(4, 3.1),
 	"f1.16xlarge":   newCPU(64, 2.3),
 	"f1.2xlarge":    newCPU(8, 2.3),
 	"f1.4xlarge":    newCPU(16, 2.3),
@@ -227,6 +237,13 @@ var instanceTypeCPU = map[string]CPU{
 	"m5n.large":     newCPU(2, 3.1),
 	"m5n.metal":     newCPU(96, 3.1),
 	"m5n.xlarge":    newCPU(4, 3.1),
+	"m5zn.12xlarge": newCPU(48, 4.5),
+	"m5zn.2xlarge":  newCPU(8, 4.5),
+	"m5zn.3xlarge":  newCPU(16, 4.5),
+	"m5zn.6xlarge":  newCPU(32, 4.5),
+	"m5zn.large":    newCPU(2, 4.5),
+	"m5zn.metal":    newCPU(48, 4.5),
+	"m5zn.xlarge":   newCPU(4, 4.5),
 	"m6g.12xlarge":  newCPU(48, 2.5),
 	"m6g.16xlarge":  newCPU(64, 2.5),
 	"m6g.2xlarge":   newCPU(8, 2.5),
@@ -245,6 +262,7 @@ var instanceTypeCPU = map[string]CPU{
 	"m6gd.medium":   newCPU(1, 2.5),
 	"m6gd.metal":    newCPU(64, 2.5),
 	"m6gd.xlarge":   newCPU(4, 2.5),
+	"mac1.metal":    newCPU(12, 3.2),
 	"p2.16xlarge":   newCPU(64, 2.3),
 	"p2.8xlarge":    newCPU(32, 2.7),
 	"p2.xlarge":     newCPU(4, 2.7),
@@ -252,6 +270,7 @@ var instanceTypeCPU = map[string]CPU{
 	"p3.2xlarge":    newCPU(8, 2.7),
 	"p3.8xlarge":    newCPU(32, 2.7),
 	"p3dn.24xlarge": newCPU(96, 2.5),
+	"p4d.24xlarge":  newCPU(96, 3),
 	"r3.2xlarge":    newCPU(8, 2.5),
 	"r3.4xlarge":    newCPU(16, 2.5),
 	"r3.8xlarge":    newCPU(32, 2.5),
@@ -288,6 +307,15 @@ var instanceTypeCPU = map[string]CPU{
 	"r5ad.8xlarge":  newCPU(32, 2.5),
 	"r5ad.large":    newCPU(2, 2.2),
 	"r5ad.xlarge":   newCPU(4, 2.2),
+	"r5b.12xlarge":  newCPU(48, 3.1),
+	"r5b.16xlarge":  newCPU(64, 3.1),
+	"r5b.24xlarge":  newCPU(96, 3.1),
+	"r5b.2xlarge":   newCPU(8, 3.1),
+	"r5b.4xlarge":   newCPU(16, 3.1),
+	"r5b.8xlarge":   newCPU(32, 3.1),
+	"r5b.large":     newCPU(2, 3.1),
+	"r5b.metal":     newCPU(96, 3.1),
+	"r5b.xlarge":    newCPU(4, 3.1),
 	"r5d.12xlarge":  newCPU(48, 3.1),
 	"r5d.16xlarge":  newCPU(64, 3.1),
 	"r5d.24xlarge":  newCPU(96, 3.1),