diff --git a/package.json b/package.json
index 67350ac8b73be..bd22b65ee1813 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "test:server": "grunt test:server",
     "test:coverage": "grunt test:coverage",
     "build": "grunt build",
+    "release": "grunt release",
     "start": "sh ./bin/kibana --dev",
     "precommit": "grunt precommit",
     "karma": "karma start",
diff --git a/tasks/release.js b/tasks/release.js
index fe57142fbb84d..ca20966549563 100644
--- a/tasks/release.js
+++ b/tasks/release.js
@@ -38,6 +38,8 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('_release:setS3Uploads', function () {
+    const { sha, version } = grunt.config.get('build');
+
     var uploads = grunt.config.get('platforms')
     .reduce(function (files, platform) {
       return files.concat(
@@ -61,10 +63,12 @@ module.exports = function (grunt) {
       }
     })
     .map(function (filename) {
-      return {
-        src: 'target/' + filename,
-        dest: 'kibana/kibana/' + filename
-      };
+      const src = `target/${filename}`;
+
+      const shortSha = sha.substr(0, 7);
+      const dest = `kibana/staging/${version}-${shortSha}/kibana/${filename}`;
+
+      return { src, dest };
     });
     grunt.config.set('s3.release.upload', uploads);
   });