diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
index 2018bea5c7..6275af8baa 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
@@ -80,7 +80,7 @@ public class EC2ComputeService implements ComputeService {
    }
 
    private Map<Image, String> imageAmiIdMap = ImmutableMap.<Image, String> builder().put(
-            Image.CENTOS_53, "ami-b0a84ad9").put(Image.RHEL_53, "ami-368b685f").build();// todo ami
+            Image.UMBUNTU_90, "ami-7e28ca17").put(Image.RHEL_53, "ami-368b685f").build();// todo ami
    // matrix of
    // region
    // 32/64 bit
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java
index 0e980fe7a8..ed2714ec99 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClient.java
@@ -59,5 +59,6 @@ public interface AvailabilityZoneAndRegionClient {
     * @see <a href="http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html"
     *      />
     */
+   @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
    Map<Region, URI> describeRegions(DescribeRegionsOptions... options);
 }
diff --git a/aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java b/aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java
index 314e08fa3d..35363c7383 100755
--- a/aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java
+++ b/aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java
@@ -95,8 +95,8 @@ public class SpeedTest {
       long timeOut = messageCount * 200; // minimum rate should be at least 5/second
 
       for (Entry<String, RestContext<SQSAsyncClient, SQSClient>> entry : ImmutableMap
-               .<String, RestContext<SQSAsyncClient, SQSClient>> of("standard",
-                        nullLoggingDefaultContext, "enterprise", nullLoggingEnterpriseContext)
+               .<String, RestContext<SQSAsyncClient, SQSClient>> of("enterprise",
+                        nullLoggingEnterpriseContext, "default", nullLoggingDefaultContext)
                .entrySet()) {
          for (Queue queue : queues) {