diff --git a/projects/README.md b/projects/README.md
index 5f1b50602..4bdbdbc81 100644
--- a/projects/README.md
+++ b/projects/README.md
@@ -14,6 +14,7 @@ If you want to create a project, please submit a pull request to create a new di
 - [Mirage SDK](miragesdk/) privilege separation for userspace services
 - [Wireguard](wireguard/) cryptographic enforced container network separation
 - [OKernel](okernel/) intra-kernel protection using EPT (HPE)
+- [AWS](aws) AWS build support
 
 ## Current projects not yet documented
 - Clear Linux integration (Intel)
diff --git a/base/alpine-aws/Dockerfile b/projects/aws/alpine-aws/Dockerfile
similarity index 100%
rename from base/alpine-aws/Dockerfile
rename to projects/aws/alpine-aws/Dockerfile
diff --git a/base/alpine-aws/Makefile b/projects/aws/alpine-aws/Makefile
similarity index 100%
rename from base/alpine-aws/Makefile
rename to projects/aws/alpine-aws/Makefile
diff --git a/tools/aws-cli/Dockerfile b/projects/aws/cli/Dockerfile
similarity index 100%
rename from tools/aws-cli/Dockerfile
rename to projects/aws/cli/Dockerfile
diff --git a/tools/aws-cli/Makefile b/projects/aws/cli/Makefile
similarity index 100%
rename from tools/aws-cli/Makefile
rename to projects/aws/cli/Makefile
diff --git a/projects/aws/roadmap.md b/projects/aws/roadmap.md
new file mode 100644
index 000000000..7894d851b
--- /dev/null
+++ b/projects/aws/roadmap.md
@@ -0,0 +1,14 @@
+# AWS support
+
+The aim is provide good integration of Moby with Amazon AWS.
+
+Currently there is a container ([cli](cli/)) containing the AWS tools to manage AWS images and a Alpine based image ([alpine-aws](alpine-aws/)) which contains the integration services for AWS.
+
+## Roadmap
+
+**Near-term:**
+- Package AWS Integrations tools/cloudinit into a container image to be used in yaml files.
+- Add support for [building AMIs](https://github.com/docker/moby/pull/1119)
+
+**Mid-term:**
+- Regular CI jobs testing AWS integration