diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java
index 35bfb23460..5525e49067 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java
@@ -60,7 +60,7 @@ public class RunningInstanceToNodeMetadata implements Function<RunningInstance,
 
       // canonical/alestic images use the ubuntu user to login
       // TODO: add this as a property of image
-      if (credentials != null && image.getImageOwnerId().equals("063491364108"))
+      if (credentials != null && image.getImageOwnerId().matches("063491364108|099720109477"))
          credentials = new Credentials("ubuntu", credentials.key);
 
       String locationId = from.getAvailabilityZone().toString();