diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
index 06882a02c2bba..5cf5bf3c5a84f 100644
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@@ -6,7 +6,7 @@ module.exports = function (grunt) {
 
   return {
     options: {
-      branch: '2.x',
+      branch: '2.4',
       fresh: !grunt.option('esvm-no-fresh'),
       config: {
         network: {
diff --git a/tasks/config/packages.js b/tasks/config/packages.js
index a7b2c7a32bc96..784dff9bad737 100644
--- a/tasks/config/packages.js
+++ b/tasks/config/packages.js
@@ -2,8 +2,8 @@ export default (grunt) => {
   const VERSION = grunt.config.get('build.version');
   const SHORT_SHA = grunt.config.get('build.sha').substr(0, 7);
 
-  const FOLDER_STAGING = `kibana/staging/${VERSION}-${SHORT_SHA}/repos/${VERSION.match(/\d\./)[0]}x`;
-  const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\./)[0]}x`;
+  const FOLDER_STAGING = `kibana/staging/${VERSION}-${SHORT_SHA}/repos/${VERSION.match(/\d\.\d/)[0]}`;
+  const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\.\d/)[0]}`;
 
   const FOLDERNAME_DEB = 'debian';
   const FOLDERNAME_RPM = 'centos';