diff --git a/apps/accessibility/webpack.js b/apps/accessibility/webpack.js
index ddcb85d34419452fc21d32d04020fac04b0be407..0d7b782f9d5c8d71d60127caf62c200592f2d1c1 100644
--- a/apps/accessibility/webpack.js
+++ b/apps/accessibility/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'accessibility.js'
+		filename: 'accessibility.js',
+		jsonpFunction: 'webpackJsonpAccessibility'
 	}
 }
diff --git a/apps/comments/webpack.js b/apps/comments/webpack.js
index b2413d148aa4bab3e8aab0cc2f3c36c4d3b6d276..8244389aeacd78a1550aa2806b8650ba7aeff3bc 100644
--- a/apps/comments/webpack.js
+++ b/apps/comments/webpack.js
@@ -5,7 +5,8 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'comments.js'
+		filename: 'comments.js',
+		jsonpFunction: 'webpackJsonpComments'
 	},
 	externals: {
 		jquery: 'jQuery'
diff --git a/apps/files_sharing/webpack.js b/apps/files_sharing/webpack.js
index a8b944326834c9877910493a642da40f5fc83941..3fc0628b20233ad805b08d6663c69407c69751f7 100644
--- a/apps/files_sharing/webpack.js
+++ b/apps/files_sharing/webpack.js
@@ -10,6 +10,7 @@ module.exports = {
 		path: path.resolve(__dirname, './js/dist/'),
 		publicPath: '/js/',
 		filename: '[name].js',
-		chunkFilename: 'files_sharing.[id].js?v=[chunkhash]'
+		chunkFilename: 'files_sharing.[id].js?v=[chunkhash]',
+		jsonpFunction: 'webpackJsonpFilesSharing'
 	}
 }
diff --git a/apps/files_trashbin/webpack.js b/apps/files_trashbin/webpack.js
index fbf378933ba12c976a05d410f22d5c58326d081b..1856c08ae801ab6a70e8ba9e2a2ccfc4ce14546c 100644
--- a/apps/files_trashbin/webpack.js
+++ b/apps/files_trashbin/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'files_trashbin.js'
+		filename: 'files_trashbin.js',
+		jsonpFunction: 'webpackJsonpFilesTrashbin'
 	}
 }
diff --git a/apps/files_versions/webpack.js b/apps/files_versions/webpack.js
index d8e9f413351becc0e8e60518fb7e05f07abde757..8d02db2d73eebd7a36912d2ef26589633b5fbd66 100644
--- a/apps/files_versions/webpack.js
+++ b/apps/files_versions/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, 'js'),
 		publicPath: '/js/',
-		filename: 'files_versions.js'
+		filename: 'files_versions.js',
+		jsonpFunction: 'webpackJsonpFilesVersions'
 	}
 }
diff --git a/apps/oauth2/webpack.js b/apps/oauth2/webpack.js
index dfaf0324eedcbc821265224695d37e9a64423400..23b9b76b31b950b65dfb03af8a4bf8d0f19ef654 100644
--- a/apps/oauth2/webpack.js
+++ b/apps/oauth2/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js',
-		filename: 'oauth2.js'
+		filename: 'oauth2.js',
+		jsonpFunction: 'webpackJsonpOauth'
 	}
 }
diff --git a/apps/systemtags/webpack.js b/apps/systemtags/webpack.js
index b4da50269972f610f947088c0c736ef3ac2a7178..b22e0b7e52a5994922eb661a59e7320f5c7477d8 100644
--- a/apps/systemtags/webpack.js
+++ b/apps/systemtags/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'systemtags.js'
+		filename: 'systemtags.js',
+		jsonpFunction: 'webpackJsonpSystemtags'
 	}
 }
diff --git a/apps/twofactor_backupcodes/webpack.js b/apps/twofactor_backupcodes/webpack.js
index ab0888f67c7601f7e88665fe026831e06bd5eaed..88d04e3409102de8950406d2681a3b1b01bb4fc0 100644
--- a/apps/twofactor_backupcodes/webpack.js
+++ b/apps/twofactor_backupcodes/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, 'js'),
 		publicPath: '/js',
-		filename: 'settings.js'
+		filename: 'settings.js',
+		jsonpFunction: 'webpackJsonpTwofactorBackupcodes'
 	}
 }
diff --git a/apps/updatenotification/webpack.js b/apps/updatenotification/webpack.js
index a13e823e1697a2fc8b173fddbde8651773b8c5d1..b90777108c7c4af7596bcbeb749e87764c4f00cb 100644
--- a/apps/updatenotification/webpack.js
+++ b/apps/updatenotification/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'updatenotification.js'
+		filename: 'updatenotification.js',
+		jsonpFunction: 'webpackJsonpUpdatenotification'
 	}
 }
diff --git a/apps/workflowengine/webpack.js b/apps/workflowengine/webpack.js
index 80ec96da675fbac1d611b677e290ba3f62ec2e11..76e46261f9379400efdc5b878e7a3761edb0416d 100644
--- a/apps/workflowengine/webpack.js
+++ b/apps/workflowengine/webpack.js
@@ -6,6 +6,7 @@ module.exports = {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
 		filename: 'workflowengine.js',
+		jsonpFunction: 'webpackJsonpWorkflowengine'
 	},
 	module: {
 		rules: [
diff --git a/core/webpack.js b/core/webpack.js
index 1cbd381aa4a57a220fcb6ad83ad419e207d7f3be..b421e12a56713276a750a4eba1cda81e82da581a 100644
--- a/core/webpack.js
+++ b/core/webpack.js
@@ -10,7 +10,8 @@ module.exports = [
 		},
 		output: {
 			filename: '[name].js',
-			path: path.resolve(__dirname, 'js/dist')
+			path: path.resolve(__dirname, 'js/dist'),
+			jsonpFunction: 'webpackJsonpCore'
 		},
 		module: {
 			rules: [
diff --git a/settings/webpack.js b/settings/webpack.js
index d606df226319b77b46f71ebd1a3871560afa09b9..cee22bded8d8a222bed2e799bc5ebcd14c0bc705 100644
--- a/settings/webpack.js
+++ b/settings/webpack.js
@@ -9,7 +9,8 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/',
-		filename: 'vue-[name].js?v=[chunkhash]'
+		filename: 'vue-[name].js?v=[chunkhash]',
+		jsonpFunction: 'webpackJsonpSettings'
 	},
 	optimization: {
 		splitChunks: {