diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
index bf7605ccd..7366ef625 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
@@ -21,7 +21,7 @@ exports[`angular configuration for android 1`] = `
   ignoreWarnings: [
     /System.import\\\\(\\\\) is deprecated/,
     /Zone\\\\.js does not support native async\\\\/await/,
-    /environment.(\\\\w+).ts is part of the TypeScript compilation but it's unused/
+    /environment(\\\\.(\\\\w+))?\\\\.ts is part of the TypeScript compilation but it's unused/
   ],
   output: {
     path: '__jest__/platforms/android/app/src/main/assets/app',
@@ -388,7 +388,7 @@ exports[`angular configuration for ios 1`] = `
   ignoreWarnings: [
     /System.import\\\\(\\\\) is deprecated/,
     /Zone\\\\.js does not support native async\\\\/await/,
-    /environment.(\\\\w+).ts is part of the TypeScript compilation but it's unused/
+    /environment(\\\\.(\\\\w+))?\\\\.ts is part of the TypeScript compilation but it's unused/
   ],
   output: {
     path: '__jest__/platforms/ios/jest/app',
diff --git a/packages/webpack5/package.json b/packages/webpack5/package.json
index fdf444771..4629641df 100644
--- a/packages/webpack5/package.json
+++ b/packages/webpack5/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/webpack",
-	"version": "5.0.0-beta.12",
+	"version": "5.0.0-beta.13",
 	"private": false,
 	"main": "dist/index.js",
 	"files": [
@@ -46,7 +46,7 @@
 		"ts-dedent": "2.1.1",
 		"ts-loader": "9.2.2",
 		"vue-loader": "15.9.7",
-		"webpack": "^5.38.1",
+		"webpack": "^5.0.0",
 		"webpack-bundle-analyzer": "4.4.2",
 		"webpack-chain": "6.5.1",
 		"webpack-cli": "^4.7.0",
diff --git a/packages/webpack5/src/configuration/angular.ts b/packages/webpack5/src/configuration/angular.ts
index 246ebeffd..78d5a8902 100644
--- a/packages/webpack5/src/configuration/angular.ts
+++ b/packages/webpack5/src/configuration/angular.ts
@@ -151,7 +151,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
 	// look for platform specific polyfills first
 	// falling back to independent polyfills
 	const polyfillsPath = [
-		resolve(getEntryDirPath(), `polyfills.${getPlatformName()}.ts`),
+		resolve(getEntryDirPath(), `polyfills.${platform}.ts`),
 		resolve(getEntryDirPath(), `polyfills.ts`),
 	].find((path) => existsSync(path));
 
@@ -191,7 +191,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
 			 * | Add only entry points to the 'files' or 'include' properties in your tsconfig.          |
 			 * +-----------------------------------------------------------------------------------------+
 			 */
-			/environment.(\w+).ts is part of the TypeScript compilation but it's unused/,
+			/environment(\.(\w+))?\.ts is part of the TypeScript compilation but it's unused/,
 		])
 	);
 
diff --git a/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts b/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts
index 662ce8b47..5434a0034 100644
--- a/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts
+++ b/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts
@@ -91,15 +91,22 @@ if (module.hot) {
 		return setStatus(hash, 'success', 'Successfully applied update.');
 	};
 
-	const hasUpdate = () => {
+	const requireExists = (path) => {
 		try {
-			__non_webpack_require__(`~/bundle.${__webpack_hash__}.hot-update.json`);
+			__non_webpack_require__(path);
 			return true;
 		} catch (err) {
 			return false;
 		}
 	};
 
+	const hasUpdate = () => {
+		return [
+			`~/bundle.${__webpack_hash__}.hot-update.json`,
+			`~/runtime.${__webpack_hash__}.hot-update.json`,
+		].some((path) => requireExists(path));
+	};
+
 	const originalOnLiveSync = global.__onLiveSync;
 	global.__onLiveSync = async function () {
 		logVerbose('LiveSync');