diff --git a/.travis.yml b/.travis.yml
index 60d4fbb..d34ee51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@
   - npm run docs
 
 deploy:
+  # Deploy config for non-tag branches
   - provider: s3
     access_key_id: $S3_ACCESS_KEY_ID
     secret_access_key: $S3_SECRET_ACCESS_KEY
@@ -38,10 +39,12 @@
     skip_cleanup: true
     acl: public_read
     region: eu-west-1
+    cache_control: "max-age=60"
     local_dir: bin
     upload-dir: "$TRAVIS_BRANCH"
     on:
         all_branches: true
+        condition: -z $TRAVIS_TAG
   - provider: s3
     access_key_id: $S3_ACCESS_KEY_ID
     secret_access_key: $S3_SECRET_ACCESS_KEY
@@ -49,7 +52,36 @@
     skip_cleanup: true
     acl: public_read
     region: eu-west-1
+    cache_control: "max-age=60"
     local_dir: docs
     upload-dir: "$TRAVIS_BRANCH/docs"
     on:
         all_branches: true
+        condition: -z $TRAVIS_TAG
+  # Deploy config for tagged releases
+  - provider: s3
+    access_key_id: $S3_ACCESS_KEY_ID
+    secret_access_key: $S3_SECRET_ACCESS_KEY
+    bucket: "pixi-builds"
+    skip_cleanup: true
+    acl: public_read
+    region: eu-west-1
+    cache_control: "max-age=2592000"
+    local_dir: bin
+    upload-dir: "$TRAVIS_BRANCH"
+    on:
+        all_branches: true
+        condition: $TRAVIS_TAG
+  - provider: s3
+    access_key_id: $S3_ACCESS_KEY_ID
+    secret_access_key: $S3_SECRET_ACCESS_KEY
+    bucket: "pixi-builds"
+    skip_cleanup: true
+    acl: public_read
+    region: eu-west-1
+    cache_control: "max-age=2592000"
+    local_dir: docs
+    upload-dir: "$TRAVIS_BRANCH/docs"
+    on:
+        all_branches: true
+        condition: $TRAVIS_TAG