diff --git a/README.md b/README.md
index fc3d1690c..6d29a657a 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ npm install elasticsearch
 
 We also provide builds of the elasticsearch.js client for use in the browser. If your project uses Angular or jQuery we also provide specifc builds for you, simply include the `elasticsearch.{{lib}}.js` files in your project instead.
 
- - v1.0.3: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/1.0.3/elasticsearch-js.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/1.0.3/elasticsearch-js.tar.gz)
- - master: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/master/elasticsearch-js.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/master/elasticsearch-js.tar.gz)
+ - v1.0.3: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.0.3.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.0.3.tar.gz)
+ - master: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-master.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-master.tar.gz)
 
 ## Docs
  - [Quick Start](http://elasticsearch.github.io/elasticsearch-js/index.html#quick-start)
diff --git a/grunt/browser_clients.js b/grunt/browser_clients.js
index ddc62124f..602a8a878 100644
--- a/grunt/browser_clients.js
+++ b/grunt/browser_clients.js
@@ -21,7 +21,7 @@ module.exports = function (grunt) {
     'copy:dist_to_named_dir',
     'compress:master_zip',
     'compress:master_tarball',
-    's3:latest'
+    's3:upload_archives'
   ]);
 
   grunt.registerTask('browser_clients:release', [
@@ -32,7 +32,7 @@ module.exports = function (grunt) {
     'copy:dist_to_named_dir',
     'compress:release_zip',
     'compress:release_tarball',
-    's3:release'
+    's3:upload_archives'
   ]);
 
   grunt.registerTask('__check_for_confirmation', function () {
diff --git a/grunt/config/s3.js b/grunt/config/s3.js
index 71a57cf5d..a3767149e 100644
--- a/grunt/config/s3.js
+++ b/grunt/config/s3.js
@@ -5,34 +5,24 @@ try {
 
 
 module.exports = {
-  options: {
-    key: config.key,
-    secret: config.secret,
-    bucket: 'download.elasticsearch.org',
-    access: 'public-read',
-    headers: {
-      'Content-Type': 'text/plain',
-      'X-Content-Type-Options': 'nosniff',
-      'Content-Disposition': 'attachment'
+  upload_archives: {
+    upload: [
+      {
+        src: '<%= distDir %>/archives/*',
+        dest: 'elasticsearch/elasticsearch-js/'
+      }
+    ],
+    options: {
+      key: config.key,
+      secret: config.secret,
+      bucket: 'download.elasticsearch.org',
+      access: 'public-read',
+      headers: {
+        'Content-Type': 'text/plain',
+        'X-Content-Type-Options': 'nosniff',
+        'Content-Disposition': 'attachment'
+      }
     }
-  },
-
-  latest: {
-    upload: [
-      {
-        src: '<%= distDir %>/archives/*',
-        dest: 'elasticsearch/elasticsearch-js/master'
-      }
-    ]
-  },
-
-  release: {
-    upload: [
-      {
-        src: '<%= distDir %>/archives/*',
-        dest: 'elasticsearch/elasticsearch-js/<%= package.version %>'
-      }
-    ]
   }
 
 };
\ No newline at end of file