diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 2327a629..61338405 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -702,19 +702,19 @@
 			"dev": true
 		},
 		"@ui5/builder": {
-			"version": "1.10.1",
-			"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-1.10.1.tgz",
-			"integrity": "sha512-F9L6qoaA81Op+4HWXKbijkSIb9XnW8ucryotscNCj84hnXwpRfDOh8KDL9Jmt4lQyvraYppg+mqpOhxAvsHK2Q==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-2.0.0.tgz",
+			"integrity": "sha512-P0WwayMF0nO8l1jTQolbtMzt5TV66e3xPsDeyn0QTCyc+lDBixFFl4sbRfL31wf4B4062nRG/iXTv4P06rMGHA==",
 			"requires": {
-				"@ui5/fs": "^1.1.2",
-				"@ui5/logger": "^1.0.2",
+				"@ui5/fs": "^2.0.0",
+				"@ui5/logger": "^2.0.0",
 				"cheerio": "^0.22.0",
 				"escape-unicode": "^0.2.0",
 				"escodegen": "^1.14.1",
 				"escope": "^3.6.0",
 				"esprima": "^4.0.1",
-				"estraverse": "^4.3.0",
-				"globby": "^10.0.2",
+				"estraverse": "^5.0.0",
+				"globby": "^11.0.0",
 				"graceful-fs": "^4.2.3",
 				"jsdoc": "~3.6.3",
 				"less-openui5": "^0.8.6",
@@ -723,43 +723,30 @@
 				"pretty-hrtime": "^1.0.3",
 				"replacestream": "^4.0.3",
 				"rimraf": "^3.0.2",
-				"semver": "^6.3.0",
+				"semver": "^7.1.3",
 				"slash": "^3.0.0",
-				"terser": "^4.6.3",
+				"terser": "^4.6.7",
 				"xml2js": "^0.4.23",
 				"yazl": "^2.5.1"
 			},
 			"dependencies": {
-				"@ui5/fs": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/@ui5/fs/-/fs-1.1.2.tgz",
-					"integrity": "sha512-WKoHz5IA10jr2rl2BrmJG7RtEnkpLqkQX84phBT+7onX9I+Yv72MspHZCQbHpGoaJxt6G3TavggchZ7FKroGEw==",
-					"requires": {
-						"@ui5/logger": "^1.0.1",
-						"clone": "^2.1.0",
-						"globby": "^10.0.0",
-						"graceful-fs": "^4.2.0",
-						"make-dir": "^3.0.0",
-						"micromatch": "^4.0.2",
-						"minimatch": "^3.0.3",
-						"mock-require": "^3.0.3",
-						"pretty-hrtime": "^1.0.3",
-						"random-int": "^2.0.0",
-						"slash": "^3.0.0"
-					}
+				"estraverse": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz",
+					"integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="
 				},
-				"@ui5/logger": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@ui5/logger/-/logger-1.0.2.tgz",
-					"integrity": "sha512-k49q5D7EBk4vGzpM81KDNyGL4YaB12v8qYNqR7/5f4xoAksotf7h3VeAjCmJFSttEOnC9LNb9GYTzJAWJoCv7w==",
+				"globby": {
+					"version": "11.0.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
+					"integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
 					"requires": {
-						"npmlog": "^4.1.2"
+						"array-union": "^2.1.0",
+						"dir-glob": "^3.0.1",
+						"fast-glob": "^3.1.1",
+						"ignore": "^5.1.4",
+						"merge2": "^1.3.0",
+						"slash": "^3.0.0"
 					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
 				}
 			}
 		},
@@ -821,6 +808,53 @@
 				"resolve": "^1.14.2"
 			},
 			"dependencies": {
+				"@ui5/builder": {
+					"version": "1.10.1",
+					"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-1.10.1.tgz",
+					"integrity": "sha512-F9L6qoaA81Op+4HWXKbijkSIb9XnW8ucryotscNCj84hnXwpRfDOh8KDL9Jmt4lQyvraYppg+mqpOhxAvsHK2Q==",
+					"requires": {
+						"@ui5/fs": "^1.1.2",
+						"@ui5/logger": "^1.0.2",
+						"cheerio": "^0.22.0",
+						"escape-unicode": "^0.2.0",
+						"escodegen": "^1.14.1",
+						"escope": "^3.6.0",
+						"esprima": "^4.0.1",
+						"estraverse": "^4.3.0",
+						"globby": "^10.0.2",
+						"graceful-fs": "^4.2.3",
+						"jsdoc": "~3.6.3",
+						"less-openui5": "^0.8.6",
+						"make-dir": "^3.0.2",
+						"pretty-data": "^0.40.0",
+						"pretty-hrtime": "^1.0.3",
+						"replacestream": "^4.0.3",
+						"rimraf": "^3.0.2",
+						"semver": "^6.3.0",
+						"slash": "^3.0.0",
+						"terser": "^4.6.3",
+						"xml2js": "^0.4.23",
+						"yazl": "^2.5.1"
+					}
+				},
+				"@ui5/fs": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/@ui5/fs/-/fs-1.1.2.tgz",
+					"integrity": "sha512-WKoHz5IA10jr2rl2BrmJG7RtEnkpLqkQX84phBT+7onX9I+Yv72MspHZCQbHpGoaJxt6G3TavggchZ7FKroGEw==",
+					"requires": {
+						"@ui5/logger": "^1.0.1",
+						"clone": "^2.1.0",
+						"globby": "^10.0.0",
+						"graceful-fs": "^4.2.0",
+						"make-dir": "^3.0.0",
+						"micromatch": "^4.0.2",
+						"minimatch": "^3.0.3",
+						"mock-require": "^3.0.3",
+						"pretty-hrtime": "^1.0.3",
+						"random-int": "^2.0.0",
+						"slash": "^3.0.0"
+					}
+				},
 				"@ui5/logger": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/@ui5/logger/-/logger-1.0.2.tgz",
@@ -828,6 +862,11 @@
 					"requires": {
 						"npmlog": "^4.1.2"
 					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
 				}
 			}
 		},
@@ -858,6 +897,35 @@
 				"yesno": "^0.3.1"
 			},
 			"dependencies": {
+				"@ui5/builder": {
+					"version": "1.10.1",
+					"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-1.10.1.tgz",
+					"integrity": "sha512-F9L6qoaA81Op+4HWXKbijkSIb9XnW8ucryotscNCj84hnXwpRfDOh8KDL9Jmt4lQyvraYppg+mqpOhxAvsHK2Q==",
+					"requires": {
+						"@ui5/fs": "^1.1.2",
+						"@ui5/logger": "^1.0.2",
+						"cheerio": "^0.22.0",
+						"escape-unicode": "^0.2.0",
+						"escodegen": "^1.14.1",
+						"escope": "^3.6.0",
+						"esprima": "^4.0.1",
+						"estraverse": "^4.3.0",
+						"globby": "^10.0.2",
+						"graceful-fs": "^4.2.3",
+						"jsdoc": "~3.6.3",
+						"less-openui5": "^0.8.6",
+						"make-dir": "^3.0.2",
+						"pretty-data": "^0.40.0",
+						"pretty-hrtime": "^1.0.3",
+						"replacestream": "^4.0.3",
+						"rimraf": "^3.0.2",
+						"semver": "^6.3.0",
+						"slash": "^3.0.0",
+						"terser": "^4.6.3",
+						"xml2js": "^0.4.23",
+						"yazl": "^2.5.1"
+					}
+				},
 				"@ui5/fs": {
 					"version": "1.1.2",
 					"resolved": "https://registry.npmjs.org/@ui5/fs/-/fs-1.1.2.tgz",
@@ -883,6 +951,11 @@
 					"requires": {
 						"npmlog": "^4.1.2"
 					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
 				}
 			}
 		},
@@ -7578,9 +7651,9 @@
 			"integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
 		},
 		"terser": {
-			"version": "4.6.7",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
-			"integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
+			"version": "4.6.10",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz",
+			"integrity": "sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==",
 			"requires": {
 				"commander": "^2.20.0",
 				"source-map": "~0.6.1",
diff --git a/package.json b/package.json
index 79096559..9b1ca536 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
 		"url": "git@github.com:SAP/ui5-cli.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^1.10.1",
+		"@ui5/builder": "^2.0.0",
 		"@ui5/fs": "^2.0.0",
 		"@ui5/logger": "^2.0.0",
 		"@ui5/project": "^1.2.0",