diff --git a/docs/aws.md b/docs/aws.md
index 1073d5cf1..56203b761 100644
--- a/docs/aws.md
+++ b/docs/aws.md
@@ -1,6 +1,6 @@
 # Using LinuxKit on Amazon Web Services (AWS)
 
-This is a quick guide to run LinuxKit on AWS. 
+This is a quick guide to run LinuxKit on AWS.
 
 ## Setup
 
@@ -32,6 +32,12 @@ specified bucket, and create a bootable image from the stored image.
 
 Alternatively, you can use the `AWS_BUCKET` environment variable to specify the bucket name.
 
+**Note:** If the push times out before it finishes, you can use the `-timeout` flag to extend the timeout.
+
+```
+linuxkit push aws -bucket bucketname -timeout 1200 aws.img
+```
+
 ## Create an instance and connect to it
 
 With the image created, we can now create an instance.
diff --git a/docs/metadata.md b/docs/metadata.md
index 6e4dcf684..d612c7655 100644
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -81,7 +81,17 @@ we extract the hostname and populate the
 `/var/config/ssh/authorized_keys` from metadata. In the future we'll
 add more complete SSH support.
 
-GCP userdata is extracted from `/computeMetadata/v1/instance/attributes/userdata`.
+GCP userdata is extracted from `/computeMetadata/v1/instance/attributes/userdata`
+and made available in `/var/config/userdata`.
+
+## AWS
+
+AWS metadata is reached via the following URL
+(`http://169.254.169.254/latest/meta-data/`) and currently we extract the
+hostname and populate the `/var/config/ssh/authorized_keys` from metadata.
+
+AWS userdata is extracted from `http://169.254.169.254/latest/user-data` and
+and made available in `/var/config/userdata`.
 
 
 ## HyperKit