diff --git a/tasks/build/index.js b/tasks/build/index.js
index f136f89179ea2..0f7c4d00de247 100644
--- a/tasks/build/index.js
+++ b/tasks/build/index.js
@@ -1,7 +1,7 @@
 module.exports = function (grunt) {
   let { flatten } = require('lodash');
 
-  grunt.registerTask('build', 'Build packages', function (arg) {
+  grunt.registerTask('build', 'Build packages', function () {
     grunt.task.run(flatten([
       '_build:getProps',
       'clean:build',
@@ -23,7 +23,7 @@ module.exports = function (grunt) {
       '_build:downloadNodeBuilds:finish',
       '_build:versionedLinks',
       '_build:archives',
-      (grunt.option('os-packages') || arg === 'ospackages') ? [
+      grunt.option('os-packages') ? [
         '_build:pleaseRun',
         '_build:osPackages',
       ] : [],
diff --git a/tasks/jenkins.js b/tasks/jenkins.js
index e3d3d9c3cc06d..801cece75d875 100644
--- a/tasks/jenkins.js
+++ b/tasks/jenkins.js
@@ -1,9 +1,12 @@
 module.exports = function (grunt) {
   let { compact } = require('lodash');
 
-  grunt.registerTask('jenkins', 'Jenkins build script', compact([
-    'test',
-    process.env.JOB_NAME === 'kibana_core' ? 'build:ospackages' : null
-  ]));
+  grunt.registerTask('jenkins', 'Jenkins build script', function () {
+    grunt.option('os-packages', true);
+    grunt.task.run(compact([
+      'test',
+      process.env.JOB_NAME === 'kibana_core' ? 'build' : null
+    ]));
+  });
 
 };