diff --git a/.travis.yml b/.travis.yml
index ae7d2c5..0cc8666 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,19 @@ services:
 install:
   - docker build -t intelliops/cronicle:latest -f Dockerfile .
   - docker build -t intelliops/cronicle-letsencrypt:latest -f Dockerfile.letsencrypt .
+  - docker build -t intelliops/cronicle-s3:latest -f Dockerfile.s3 .
   - docker run --name cronicle -d -p 127.0.0.1:3012:3012 intelliops/cronicle:latest
   - docker run --name cronicle-letsencrypt -d -p 127.0.0.1:4012:3012 intelliops/cronicle-letsencrypt:latest
+  - docker run --name cronicle-s3 -d -p 127.0.0.1:5012:3012 intelliops/cronicle-s3:latest
 
 script:
   - docker ps -a
   - sleep 20
   - docker exec cronicle /bin/ash -c "cat /opt/cronicle/conf/config.json"
   - docker exec cronicle-letsencrypt /bin/ash -c "cat /opt/cronicle/conf/config.json"
+  - docker exec cronicle-s3 /bin/ash -c "cat /opt/cronicle/conf/config.json"
   - curl http://localhost:3012 | grep LICENSE
   - curl http://localhost:4012 | grep LICENSE
-  - docker stop cronicle cronicle-letsencrypt
-  - docker rm -f cronicle cronicle-letsencrypt
+  - curl http://localhost:5012 | grep LICENSE
+  - docker stop cronicle cronicle-letsencrypt cronicle-s3
+  - docker rm -f cronicle cronicle-letsencrypt cronicle-s3
diff --git a/Dockerfile.s3 b/Dockerfile.s3
new file mode 100644
index 0000000..0fa0790
--- /dev/null
+++ b/Dockerfile.s3
@@ -0,0 +1,5 @@
+FROM       intelliops/cronicle:latest
+LABEL      maintainer="Sander Bel <sander@intelliops.be>"
+
+# Amazon S3
+RUN        npm install aws-sdk
diff --git a/README.md b/README.md
index c6d22fd..1ca48ef 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Docker container for a Cronicle single-server master node
 
 * `0.8.28`, `latest` [Dockerfile](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile)
 * `0.8.28-letsencrypt`, `letsencrypt` [Dockerfile.letsencrypt](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile.letsencrypt)
+* `0.8.28-s3`, `s3` [Dockerfile.s3](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile.s3)
 
 ## latest
 Latest version of Cronicle server based upon nodejs Docker image.
@@ -16,6 +17,10 @@ Same as the `latest` Docker image, but with support for Let's Encrypt
 certificates. Which means that the Cronicle server can be used with SSL and a
 Let's Encrypt certificate. If this is not needed, just use the tag `latest`.
 
+## s3
+Same as the `latest` Docker image, but with support for Amazon S3 storage. If
+there is no need for S3, again, just go for `latest`.
+
 # Usage
 
 ## Install