diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index f3a7780..78eed6d 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -922,6 +922,26 @@ docker-compose up -d minio
   ```
 
 
+
+<br>
+<a name="Use-AWS"></a>
+## Use AWS
+
+1 - Configure AWS:
+  - make sure to add your SSH keys in aws/ssh_keys folder
+
+2 - Run the Aws Container (`aws`) with the `docker-compose up` command. Example:
+
+```bash
+docker-compose up -d aws
+```
+
+3 - Access the aws container with `docker-compose exec aws bash`
+
+4 - To start using eb cli inside the container, initiaze your project first by doing 'eb init'. Read the [aws eb cli](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-configuration.html) docs for more details.
+
+
+
 <br>
 <a name="CodeIgniter"></a>
 
diff --git a/aws/.gitignore b/aws/.gitignore
new file mode 100644
index 0000000..4619483
--- /dev/null
+++ b/aws/.gitignore
@@ -0,0 +1 @@
+./ssh_keys
diff --git a/aws/Dockerfile b/aws/Dockerfile
new file mode 100644
index 0000000..4f03e9d
--- /dev/null
+++ b/aws/Dockerfile
@@ -0,0 +1,17 @@
+FROM python:slim
+
+MAINTAINER melchabcede@gmail.com
+
+RUN pip install --upgrade --no-cache-dir awsebcli
+RUN apt-get -yqq update && apt-get -yqq install git-all
+
+#NOTE: make sure ssh keys are added to ssh_keys folder
+
+RUN mkdir root/tmp_ssh
+COPY /ssh_keys/. /root/.ssh/
+RUN cd /root/.ssh && chmod 600 * && chmod 644 *.pub
+
+# Set default work directory
+WORKDIR /var/www
+
+
diff --git a/docker-compose.yml b/docker-compose.yml
index d7ddf84..3d8d9d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -638,6 +638,16 @@ services:
         - frontend
         - backend
 
+### AWS EB-CLI ####
+    aws:
+      build:
+        context: ./aws
+      volumes_from:
+        - applications
+      depends_on:
+        - workspace
+      tty: true
+
 ### Networks Setup ############################################
 
 networks: