diff --git a/tasks/config/aws_s3.js b/tasks/config/aws_s3.js
index 211e1d06d97da..f499250bf354b 100644
--- a/tasks/config/aws_s3.js
+++ b/tasks/config/aws_s3.js
@@ -1,19 +1,55 @@
 export default function (grunt) {
   const { sha, version } = grunt.config.get('build');
+  const versionSha = `${version}-${sha.substr(0, 7)}`;
+
+  const ciHash = versionSha.replace('-SNAPSHOT', '');
+  const ciOptions = {
+    bucket: 'kibana-ci-artifacts',
+    region: 'us-west-2'
+  };
 
   return {
     options: {
-      bucket: 'download.elasticsearch.org',
       access: 'private',
       uploadConcurrency: 10
     },
 
     staging: {
+      options: {
+        bucket: 'download.elasticsearch.org',
+      },
+      files: [{
+        expand: true,
+        cwd: 'target',
+        src: ['**'],
+        dest: `kibana/staging/${versionSha}/kibana/`
+      }]
+    },
+    'ci_screenshots': {
+      options: ciOptions,
       files: [{
+        expand: true,
+        cwd: 'test/functional/screenshots',
+        src: ['**'],
+        dest: `kibana/${ciHash}/screenshots/`
+      }]
+    },
+    'ci_packages': {
+      options: ciOptions,
+      files:[{
         expand: true,
         cwd: 'target',
         src: ['**'],
-        dest: `kibana/staging/${version}-${sha.substr(0, 7)}/kibana/`
+        dest: `kibana/${ciHash}/packages/`
+      }]
+    },
+    'ci_docs': {
+      options: ciOptions,
+      files:[{
+        expand: true,
+        cwd: 'html_docs',
+        src: ['**'],
+        dest: `kibana/${ciHash}/html_docs/`
       }]
     }
   };
diff --git a/tasks/jenkins.js b/tasks/jenkins.js
index 0bc49d62c29d4..01ec9cefe8253 100644
--- a/tasks/jenkins.js
+++ b/tasks/jenkins.js
@@ -39,7 +39,9 @@ module.exports = function (grunt) {
     'jenkins:env',
     'rejectRejFiles',
 
-    'test:uiRelease'
+    'test:uiRelease',
+    'aws_s3:ci_screenshots',
+    'aws_s3:ci_packages'
   ]);
 
 };