diff --git a/scripts/kibana_keystore.js b/scripts/kibana_keystore.js
index 3efd3500e1f8e..3f970a6517225 100644
--- a/scripts/kibana_keystore.js
+++ b/scripts/kibana_keystore.js
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-require('../src/setup_node_env');
-require('../src/cli_keystore');
+require('../src/cli_keystore/dev');
diff --git a/scripts/kibana_plugin.js b/scripts/kibana_plugin.js
index 2478e515297ef..5196bdbb853f5 100644
--- a/scripts/kibana_plugin.js
+++ b/scripts/kibana_plugin.js
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-require('../src/setup_node_env');
-require('../src/cli_plugin/cli');
+require('../src/cli_plugin/dev');
diff --git a/src/cli/dist.js b/src/cli/dist.js
index 2e26eaf52e836..05f0a68aa495c 100644
--- a/src/cli/dist.js
+++ b/src/cli/dist.js
@@ -18,6 +18,5 @@
  */
 
 require('../apm')();
-require('../setup_node_env/no_transpilation');
-require('core-js/stable');
+require('../setup_node_env/dist');
 require('./cli');
diff --git a/src/cli_keystore/index.js b/src/cli_keystore/dev.js
similarity index 100%
rename from src/cli_keystore/index.js
rename to src/cli_keystore/dev.js
diff --git a/src/cli_keystore/dist.js b/src/cli_keystore/dist.js
new file mode 100644
index 0000000000000..60abe225372aa
--- /dev/null
+++ b/src/cli_keystore/dist.js
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('../setup_node_env/dist');
+require('./cli_keystore');
diff --git a/src/cli_plugin/index.js b/src/cli_plugin/dev.js
similarity index 100%
rename from src/cli_plugin/index.js
rename to src/cli_plugin/dev.js
diff --git a/src/cli_plugin/dist.js b/src/cli_plugin/dist.js
new file mode 100644
index 0000000000000..cc931f60db1e4
--- /dev/null
+++ b/src/cli_plugin/dist.js
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('../setup_node_env/dist');
+require('./cli');
diff --git a/src/dev/build/tasks/bin/scripts/kibana-keystore b/src/dev/build/tasks/bin/scripts/kibana-keystore
index d811e70095548..9d2fd64c1c4eb 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-keystore
+++ b/src/dev/build/tasks/bin/scripts/kibana-keystore
@@ -26,4 +26,4 @@ if [ -f "${CONFIG_DIR}/node.options" ]; then
   KBN_NODE_OPTS="$(grep -v ^# < ${CONFIG_DIR}/node.options | xargs)"
 fi
 
-NODE_OPTIONS="$KBN_NODE_OPTS $NODE_OPTIONS" "${NODE}" "${DIR}/src/cli_keystore" "$@"
+NODE_OPTIONS="$KBN_NODE_OPTS $NODE_OPTIONS" "${NODE}" "${DIR}/src/cli_keystore/dist" "$@"
diff --git a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
index 7e227141c8ba3..2214769efc410 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
@@ -28,7 +28,7 @@ IF EXIST "%CONFIG_DIR%\node.options" (
 )
 
 TITLE Kibana Keystore
-"%NODE%" "%DIR%\src\cli_keystore" %*
+"%NODE%" "%DIR%\src\cli_keystore\dist" %*
 
 :finally
 
diff --git a/src/dev/build/tasks/bin/scripts/kibana-plugin b/src/dev/build/tasks/bin/scripts/kibana-plugin
index f4486e9cf85fb..78fdb7702643f 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-plugin
+++ b/src/dev/build/tasks/bin/scripts/kibana-plugin
@@ -26,4 +26,4 @@ if [ -f "${CONFIG_DIR}/node.options" ]; then
   KBN_NODE_OPTS="$(grep -v ^# < ${CONFIG_DIR}/node.options | xargs)"
 fi
 
-NODE_OPTIONS="--no-warnings $KBN_NODE_OPTS $NODE_OPTIONS" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli_plugin" "$@"
+NODE_OPTIONS="--no-warnings $KBN_NODE_OPTS $NODE_OPTIONS" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli_plugin/dist" "$@"
diff --git a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
index 4fb30977fda06..0a6d135565e50 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
@@ -32,7 +32,7 @@ IF EXIST "%CONFIG_DIR%\node.options" (
 set "NODE_OPTIONS=--no-warnings %NODE_OPTIONS%"
 
 TITLE Kibana Server
-"%NODE%" "%DIR%\src\cli_plugin" %*
+"%NODE%" "%DIR%\src\cli_plugin\dist" %*
 
 :finally
 
diff --git a/src/dev/build/tasks/bin/scripts/kibana.bat b/src/dev/build/tasks/bin/scripts/kibana.bat
index 98dd9ec05a48c..19bf8157ed7c8 100755
--- a/src/dev/build/tasks/bin/scripts/kibana.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana.bat
@@ -34,7 +34,7 @@ set "NODE_OPTIONS=--no-warnings --max-http-header-size=65536 %NODE_OPTIONS%"
 
 :: This should run independently as the last instruction
 :: as we need NODE_OPTIONS previously set to expand
-"%NODE%" "%DIR%\src\cli" %*
+"%NODE%" "%DIR%\src\cli\dist" %*
 
 :finally
 
diff --git a/src/dev/build/tasks/copy_source_task.ts b/src/dev/build/tasks/copy_source_task.ts
index a5039717760ae..da282f1940662 100644
--- a/src/dev/build/tasks/copy_source_task.ts
+++ b/src/dev/build/tasks/copy_source_task.ts
@@ -40,7 +40,7 @@ export const CopySource: Task = {
         '!src/dev/**',
         '!src/setup_node_env/babel_register/index.js',
         '!src/setup_node_env/babel_register/register.js',
-        '!**/public/**',
+        '!**/public/**/*.{js,ts,tsx,json}',
         'typings/**',
         'config/kibana.yml',
         'config/node.options',
diff --git a/src/setup_node_env/dist.js b/src/setup_node_env/dist.js
new file mode 100644
index 0000000000000..dd3af8c48a30a
--- /dev/null
+++ b/src/setup_node_env/dist.js
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('./no_transpilation');
+require('./polyfill');
diff --git a/src/setup_node_env/polyfill.js b/src/setup_node_env/polyfill.js
new file mode 100644
index 0000000000000..ad87354c83429
--- /dev/null
+++ b/src/setup_node_env/polyfill.js
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('core-js/stable');