diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.conf b/src/vmm_mad/remotes/ec2/ec2_driver.conf
index 2a1d737efd..831733c733 100644
--- a/src/vmm_mad/remotes/ec2/ec2_driver.conf
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.conf
@@ -1,7 +1,21 @@
 proxy_uri:
-state_wait_timeout_seconds: 300
-state_wait_pm_timeout_seconds: 1500
+state_wait_timeout_seconds: 1500
 instance_types:
+    a1.2xlarge:
+        cpu: 8
+        memory: 16.0
+    a1.4xlarge:
+        cpu: 16
+        memory: 32.0
+    a1.large:
+        cpu: 2
+        memory: 4.0
+    a1.medium:
+        cpu: 1
+        memory: 2.0
+    a1.xlarge:
+        cpu: 4
+        memory: 8.0
     c1.medium:
         cpu: 2
         memory: 1.7
@@ -74,6 +88,24 @@ instance_types:
     c5d.xlarge:
         cpu: 4
         memory: 8.0
+    c5n.18xlarge:
+        cpu: 72
+        memory: 192.0
+    c5n.2xlarge:
+        cpu: 8
+        memory: 21.0
+    c5n.4xlarge:
+        cpu: 16
+        memory: 42.0
+    c5n.9xlarge:
+        cpu: 36
+        memory: 96.0
+    c5n.large:
+        cpu: 2
+        memory: 5.25
+    c5n.xlarge:
+        cpu: 4
+        memory: 10.5
     cc2.8xlarge:
         cpu: 32
         memory: 60.5
@@ -98,6 +130,9 @@ instance_types:
     f1.2xlarge:
         cpu: 8
         memory: 122.0
+    f1.4xlarge:
+        cpu: 16
+        memory: 244.0
     g2.2xlarge:
         cpu: 8
         memory: 15.0
@@ -113,6 +148,9 @@ instance_types:
     g3.8xlarge:
         cpu: 32
         memory: 244.0
+    g3s.xlarge:
+        cpu: 4
+        memory: 30.5
     h1.16xlarge:
         cpu: 64
         memory: 256.0
@@ -227,9 +265,30 @@ instance_types:
     m5.large:
         cpu: 2
         memory: 8.0
+    m5.metal:
+        cpu: 96
+        memory: 384.0
     m5.xlarge:
         cpu: 4
         memory: 16.0
+    m5a.12xlarge:
+        cpu: 48
+        memory: 192.0
+    m5a.24xlarge:
+        cpu: 96
+        memory: 384.0
+    m5a.2xlarge:
+        cpu: 8
+        memory: 32.0
+    m5a.4xlarge:
+        cpu: 16
+        memory: 64.0
+    m5a.large:
+        cpu: 2
+        memory: 8.0
+    m5a.xlarge:
+        cpu: 4
+        memory: 16.0
     m5d.12xlarge:
         cpu: 48
         memory: 192.0
@@ -245,6 +304,9 @@ instance_types:
     m5d.large:
         cpu: 2
         memory: 8.0
+    m5d.metal:
+        cpu: 96
+        memory: 384.0
     m5d.xlarge:
         cpu: 4
         memory: 16.0
@@ -266,6 +328,9 @@ instance_types:
     p3.8xlarge:
         cpu: 32
         memory: 244.0
+    p3dn.24xlarge:
+        cpu: 96
+        memory: 768.0
     r3.2xlarge:
         cpu: 8
         memory: 61.0
@@ -299,6 +364,66 @@ instance_types:
     r4.xlarge:
         cpu: 4
         memory: 30.5
+    r5.12xlarge:
+        cpu: 48
+        memory: 384.0
+    r5.24xlarge:
+        cpu: 96
+        memory: 768.0
+    r5.2xlarge:
+        cpu: 8
+        memory: 64.0
+    r5.4xlarge:
+        cpu: 16
+        memory: 128.0
+    r5.large:
+        cpu: 2
+        memory: 16.0
+    r5.metal:
+        cpu: 96
+        memory: 768.0
+    r5.xlarge:
+        cpu: 4
+        memory: 32.0
+    r5a.12xlarge:
+        cpu: 48
+        memory: 384.0
+    r5a.24xlarge:
+        cpu: 96
+        memory: 768.0
+    r5a.2xlarge:
+        cpu: 8
+        memory: 64.0
+    r5a.4xlarge:
+        cpu: 16
+        memory: 128.0
+    r5a.large:
+        cpu: 2
+        memory: 16.0
+    r5a.xlarge:
+        cpu: 4
+        memory: 32.0
+    r5d.12xlarge:
+        cpu: 48
+        memory: 384.0
+    r5d.24xlarge:
+        cpu: 96
+        memory: 768.0
+    r5d.2xlarge:
+        cpu: 8
+        memory: 64.0
+    r5d.4xlarge:
+        cpu: 16
+        memory: 128.0
+    r5d.large:
+        cpu: 2
+        memory: 16.0
+    r5d.metal:
+        cpu: 96
+        memory: 768.0
+    r5d.xlarge:
+        cpu: 4
+        memory: 32.0
     t1.micro:
         cpu: 1
         memory: 0.613
@@ -323,6 +448,27 @@ instance_types:
     t2.xlarge:
         cpu: 4
         memory: 16.0
+    t3.2xlarge:
+        cpu: 8
+        memory: 32.0
+    t3.large:
+        cpu: 2
+        memory: 8.0
+    t3.medium:
+        cpu: 2
+        memory: 4.0
+    t3.micro:
+        cpu: 2
+        memory: 1.0
+    t3.nano:
+        cpu: 2
+        memory: 0.5
+    t3.small:
+        cpu: 2
+        memory: 2.0
+    t3.xlarge:
+        cpu: 4
+        memory: 16.0
     x1.16xlarge:
         cpu: 64
         memory: 976.0
@@ -347,3 +493,24 @@ instance_types:
     x1e.xlarge:
         cpu: 4
         memory: 122.0
+    z1d.12xlarge:
+        cpu: 48
+        memory: 384.0
+    z1d.2xlarge:
+        cpu: 8
+        memory: 64.0
+    z1d.3xlarge:
+        cpu: 12
+        memory: 96.0
+    z1d.6xlarge:
+        cpu: 24
+        memory: 192.0
+    z1d.large:
+        cpu: 2
+        memory: 16.0
+    z1d.metal:
+        cpu: 48
+        memory: 384.0
+    z1d.xlarge:
+        cpu: 4
+        memory: 32.0