diff --git a/build/broccoli/write-package-json.js b/build/broccoli/write-package-json.js
index cffc281b2c..0bd5a8253e 100644
--- a/build/broccoli/write-package-json.js
+++ b/build/broccoli/write-package-json.js
@@ -6,7 +6,7 @@ const funnel = require('broccoli-funnel');
 const UnwatchedDir = require('broccoli-source').UnwatchedDir;
 
 const PACKAGE_JSON_FIELDS = {
-  main: 'dist/commonjs/es5/index.js',
+  main: 'dist/commonjs/es2017/index.js',
   'jsnext:main': 'dist/modules/es5/index.js',
   module: 'dist/modules/es2017/index.js',
   typings: 'dist/types/index.d.ts',
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 88f1a434bd..2b361b5566 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -56,7 +56,7 @@ module.exports = function() {
       ['types'],
     ];
   } else {
-    matrix = [['amd', 'es5'], ['commonjs', 'es5'], ['modules', 'es2017'], ['types']];
+    matrix = [['amd', 'es5'], ['commonjs', 'es2017'], ['modules', 'es2017'], ['types']];
   }
 
   // Third, build our module/ES combinations for each package.