diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d0c440ed..6ddeb222 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,3 @@
-## 🚨 Issues Have Been Transferred to UI5 Tooling Repository
+## 🚨 Issues Have Been Transferred to UI5 CLI Repository
 
-Please create new issues in the UI5 Tooling repository: https://github.com/SAP/ui5-tooling/issues/new/choose
+Please create new issues in the UI5 CLI repository: https://github.com/UI5/cli/issues/new/choose
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index afeecf17..34df0980 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report UI5 Tooling Issues or Request a Feature
-    url: https://github.com/SAP/ui5-tooling/issues/new/choose
-    about: Please create new issues in the UI5 Tooling repository
+  - name: Report UI5 CLI Issues or Request a Feature
+    url: https://github.com/UI5/cli/issues/new/choose
+    about: Please create new issues in the UI5 CLI repository
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 98c8c204..2f043b5c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 To get it merged faster, kindly review the checklist below:
 
 ## Pull Request Checklist
-- [ ] Reviewed the [Contributing Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md#-contributing-code)
-    + Especially the [How to Contribute](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md#how-to-contribute) section 
-- [ ] [No merge commits](https://github.com/SAP/ui5-tooling/blob/main/docs/Guidelines.md#no-merge-commits)
-- [ ] [Correct commit message style](https://github.com/SAP/ui5-tooling/blob/main/docs/Guidelines.md#commit-message-style)
+- [ ] Reviewed the [Contributing Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md#-contributing-code)
+    + Especially the [How to Contribute](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md#how-to-contribute) section 
+- [ ] [No merge commits](https://github.com/UI5/cli/blob/main/docs/Guidelines.md#no-merge-commits)
+- [ ] [Correct commit message style](https://github.com/UI5/cli/blob/main/docs/Guidelines.md#commit-message-style)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 603b729b..2ddb6276 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
-# Contributing to the UI5 Tooling
+# Contributing to the UI5 CLI
 
-See CONTRIBUTING.md in the [SAP/ui5-tooling](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md) repository.
+See CONTRIBUTING.md in the [UI5/cli](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md) repository.
diff --git a/README.md b/README.md
index 5a8b6e59..d42d2354 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-tooling/main/docs/images/UI5_logo_wide.png)
+![UI5 icon](https://raw.githubusercontent.com/UI5/cli/main/docs/images/UI5_logo_wide.png)
 
 # ui5-server
 > Modules for running a UI5 development server  
-> Part of the [UI5 Tooling](https://github.com/SAP/ui5-tooling)
+> Part of the [UI5 CLI](https://github.com/UI5/cli)
 
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/ui5-server)](https://api.reuse.software/info/github.com/SAP/ui5-server)
 [![Build Status](https://dev.azure.com/sap/opensource/_apis/build/status/SAP.ui5-server?branchName=main)](https://dev.azure.com/sap/opensource/_build/latest?definitionId=34&branchName=main)
@@ -10,17 +10,17 @@
 [![Coverage Status](https://coveralls.io/repos/github/SAP/ui5-server/badge.svg)](https://coveralls.io/github/SAP/ui5-server)
 
 ## Documentation
-UI5 Server documentation can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/v4/pages/Server/)
+UI5 Server documentation can be found here: [ui5.github.io/cli](https://ui5.github.io/cli/v4/pages/Server/)
 
-The UI5 Server API Reference can be found here: [`@ui5/server`](https://sap.github.io/ui5-tooling/v4/api/module-@ui5_server.html)
+The UI5 Server API Reference can be found here: [`@ui5/server`](https://ui5.github.io/cli/v4/api/module-@ui5_server.html)
 
 ## Contributing
-Please check our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md).
+Please check our [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md).
 
 ## Support
-Please follow our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md#report-an-issue) on how to report an issue.
+Please follow our [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md#report-an-issue) on how to report an issue.
 
-Please report issues in the main [UI5 Tooling](https://github.com/SAP/ui5-tooling) repository.
+Please report issues in the main [UI5 CLI](https://github.com/UI5/cli) repository.
 
 ## Release History
 See [CHANGELOG.md](CHANGELOG.md).
diff --git a/REUSE.toml b/REUSE.toml
index c32ac1d2..9305700e 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -7,7 +7,7 @@ SPDX-PackageComment = "The code in this project may include calls to APIs (“AP
 [[annotations]]
 path = "**"
 precedence = "aggregate"
-SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and UI5 Tooling contributors"
+SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and UI5 CLI contributors"
 SPDX-License-Identifier = "Apache-2.0"
 
 [[annotations]]
diff --git a/jsdoc.json b/jsdoc.json
index b306e387..2f1e5eee 100644
--- a/jsdoc.json
+++ b/jsdoc.json
@@ -25,11 +25,11 @@
 		}
 	},
 	"openGraph": {
-		"title": "UI5 Tooling - API Reference",
+		"title": "UI5 CLI - API Reference",
 		"type": "website",
-		"image": "https://sap.github.io/ui5-tooling/v4/images/UI5_logo_wide.png",
-		"site_name": "UI5 Tooling - API Reference",
-		"url": "https://sap.github.io/ui5-tooling/"
+		"image": "https://ui5.github.io/cli/v4/images/UI5_logo_wide.png",
+		"site_name": "UI5 CLI - API Reference",
+		"url": "https://ui5.github.io/cli/"
 	},
 	"docdash": {
 		"sectionOrder": [
@@ -43,8 +43,8 @@
 			"Interfaces"
 		],
 		"meta": {
-			"title": "UI5 Tooling - API Reference - UI5 Server",
-			"description": "UI5 Tooling - API Reference - UI5 Server",
+			"title": "UI5 CLI - API Reference - UI5 Server",
+			"description": "UI5 CLI - API Reference - UI5 Server",
 			"keyword": "openui5 sapui5 ui5 build development tool api reference"
 		},
 		"search": true,
diff --git a/lib/middleware/MiddlewareManager.js b/lib/middleware/MiddlewareManager.js
index fa518073..36894892 100644
--- a/lib/middleware/MiddlewareManager.js
+++ b/lib/middleware/MiddlewareManager.js
@@ -101,8 +101,8 @@ class MiddlewareManager {
 				throw new Error(
 					`Standard middleware "connectUi5Proxy", referenced by middleware "${middlewareName}" ` +
 					`in project ${this.middlewareUtil.getProject()}, ` +
-					`has been removed in this version of UI5 Tooling and can't be referenced anymore. ` +
-					`Please see the migration guide at https://sap.github.io/ui5-tooling/updates/migrate-v3/`);
+					`has been removed in this version of UI5 CLI and can't be referenced anymore. ` +
+					`Please see the migration guide at https://ui5.github.io/cli/updates/migrate-v3/`);
 			}
 			if (refMiddlewareIdx === -1) {
 				throw new Error(`Could not find middleware ${refMiddlewareName}, referenced by custom ` +
diff --git a/lib/middleware/serveResources.js b/lib/middleware/serveResources.js
index f0f93cac..3e6c1d0a 100644
--- a/lib/middleware/serveResources.js
+++ b/lib/middleware/serveResources.js
@@ -110,7 +110,7 @@ function createMiddleware({resources, middlewareUtil}) {
 				res.setHeader("ETag", etagHeader);
 			} else {
 				// Fallback to buffer if stats are not available or insufficient or resource is modified.
-				// Modified resources must use the buffer for cache invalidation so that UI5 Tooling changes
+				// Modified resources must use the buffer for cache invalidation so that UI5 CLI changes
 				// invalidate the cache even when the original resource is not modified.
 				res.setHeader("ETag", etag(await resource.getBuffer()));
 			}
diff --git a/lib/server.js b/lib/server.js
index eb865b04..3b108a55 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -182,7 +182,7 @@ export async function serve(graph, {
 	if (h2) {
 		const nodeVersion = parseInt(process.versions.node.split(".")[0], 10);
 		if (nodeVersion >= 24) {
-			log.error("ERROR: With Node v24, usage of HTTP/2 is no longer supported. Please check https://github.com/SAP/ui5-tooling/issues/327 for updates.");
+			log.error("ERROR: With Node v24, usage of HTTP/2 is no longer supported. Please check https://github.com/UI5/cli/issues/327 for updates.");
 			process.exit(1);
 		}
 
diff --git a/package-lock.json b/package-lock.json
index 1307e546..7dea69dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
 			"devDependencies": {
 				"@eslint/js": "^9.8.0",
 				"@istanbuljs/esm-loader-hook": "^0.3.0",
-				"@ui5/project": "^4.0.4",
+				"@ui5/project": "^4.0.5",
 				"ava": "^6.4.1",
 				"chokidar-cli": "^3.0.0",
 				"cross-env": "^7.0.3",
@@ -1579,19 +1579,19 @@
 			}
 		},
 		"node_modules/@ui5/project": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/@ui5/project/-/project-4.0.4.tgz",
-			"integrity": "sha512-uSIypfUFtLCND2mDWP+6Btr3Gk/+zuMmG5px+WiH1BkV8NoIJcD/3XZPzj1lYnaCJxwVTLPyfzTUl5xZBL4ryg==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/@ui5/project/-/project-4.0.5.tgz",
+			"integrity": "sha512-EGY4YqvPc218Ldc08prYkEc+h9eXjfJp1lBOWjAM5ee22NYBPo2wF9W6r7C5J+BovXiPlh26c7+jIhR1wHlh2Q==",
 			"dev": true,
 			"dependencies": {
 				"@npmcli/config": "^9.0.0",
-				"@ui5/fs": "^4.0.1",
-				"@ui5/logger": "^4.0.1",
+				"@ui5/fs": "^4.0.2",
+				"@ui5/logger": "^4.0.2",
 				"ajv": "^6.12.6",
 				"ajv-errors": "^1.0.1",
-				"chalk": "^5.3.0",
+				"chalk": "^5.6.2",
 				"escape-string-regexp": "^5.0.0",
-				"globby": "^14.0.2",
+				"globby": "^14.1.0",
 				"graceful-fs": "^4.2.11",
 				"js-yaml": "^4.1.0",
 				"lockfile": "^1.0.4",
@@ -1601,8 +1601,8 @@
 				"pretty-hrtime": "^1.0.3",
 				"read-package-up": "^11.0.0",
 				"read-pkg": "^9.0.1",
-				"resolve": "^1.22.8",
-				"semver": "^7.6.3",
+				"resolve": "^1.22.10",
+				"semver": "^7.7.2",
 				"xml2js": "^0.6.2",
 				"yesno": "^0.4.0"
 			},
@@ -1611,7 +1611,7 @@
 				"npm": ">= 8"
 			},
 			"peerDependencies": {
-				"@ui5/builder": "^4.0.4"
+				"@ui5/builder": "^4.0.11"
 			},
 			"peerDependenciesMeta": {
 				"@ui5/builder": {
diff --git a/package.json b/package.json
index f24b6243..61e330f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@ui5/server",
 	"version": "4.0.6",
-	"description": "UI5 Tooling - Server",
+	"description": "UI5 CLI - Server",
 	"author": {
 		"name": "SAP SE",
 		"email": "openui5@sap.com",
@@ -140,7 +140,7 @@
 	"devDependencies": {
 		"@eslint/js": "^9.8.0",
 		"@istanbuljs/esm-loader-hook": "^0.3.0",
-		"@ui5/project": "^4.0.4",
+		"@ui5/project": "^4.0.5",
 		"ava": "^6.4.1",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
diff --git a/test/lib/server/middleware/MiddlewareManager.js b/test/lib/server/middleware/MiddlewareManager.js
index 936931a5..fb297df3 100644
--- a/test/lib/server/middleware/MiddlewareManager.js
+++ b/test/lib/server/middleware/MiddlewareManager.js
@@ -199,7 +199,7 @@ test("addMiddleware: Add middleware with beforeMiddleware=connectUi5Proxy", asyn
 	});
 
 	t.is(err.message,
-		"Standard middleware \"connectUi5Proxy\", referenced by middleware \"customMiddleware\" in project root project, has been removed in this version of UI5 Tooling and can't be referenced anymore. Please see the migration guide at https://sap.github.io/ui5-tooling/updates/migrate-v3/",
+		"Standard middleware \"connectUi5Proxy\", referenced by middleware \"customMiddleware\" in project root project, has been removed in this version of UI5 CLI and can't be referenced anymore. Please see the migration guide at https://ui5.github.io/cli/updates/migrate-v3/",
 		"Trying to bind to a non-existing standard middleware");
 });
 
diff --git a/test/lib/server/middleware/MiddlewareUtil.js b/test/lib/server/middleware/MiddlewareUtil.js
index 6d04c5aa..d62af6c9 100644
--- a/test/lib/server/middleware/MiddlewareUtil.js
+++ b/test/lib/server/middleware/MiddlewareUtil.js
@@ -388,6 +388,6 @@ test("getInterface: specVersion unknown", (t) => {
 
 	t.is(err.message,
 		"Unsupported Specification Version 1.5 defined. Your UI5 CLI installation might be outdated. " +
-		"For details, see https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions",
+		"For details, see https://ui5.github.io/cli/pages/Configuration/#specification-versions",
 		"Throw with correct error message");
 });