diff --git a/README.md b/README.md
index 8487f04..0ac0270 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![UI5 logo](/docs/images/UI5_logo_wide.png)
-[![CI](https://github.com/SAP-samples/ui5-webcomponents-sample-vue/actions/workflows/ci.yaml/badge.svg)](https://github.com/SAP-samples/ui5-webcomponents-sample-vue/actions/workflows/ci.yaml)
-[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/ui5-webcomponents-sample-vue)](https://api.reuse.software/info/github.com/SAP-samples/ui5-webcomponents-sample-vue)
+[![CI](https://github.com/UI5/sample-webcomponents-vue/actions/workflows/ci.yaml/badge.svg)](https://github.com/UI5/sample-webcomponents-vue/actions/workflows/ci.yaml)
+[![REUSE status](https://api.reuse.software/badge/github.com/UI5/sample-webcomponents-vue)](https://api.reuse.software/info/github.com/UI5/sample-webcomponents-vue)
 
 # UI5 Web Components Vue Sample Application
 
@@ -14,8 +14,8 @@ This project was bootstrapped with [Vue CLI](https://cli.vuejs.org/)
 ## Getting started
 1. [Clone this repository](https://help.github.com/articles/cloning-a-repository/) using the [GitHub Command line tool](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) and navigate into the downloaded directory.
     ```sh
-    git clone https://github.com/SAP-samples/ui5-webcomponents-sample-vue.git
-    cd ui5-webcomponents-sample-vue
+    git clone https://github.com/UI5/sample-webcomponents-vue.git
+    cd sample-webcomponents-vue
     ```
 1. Install all dependencies
     ```sh
diff --git a/REUSE.toml b/REUSE.toml
index 4dc3b55..580b64b 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -1,7 +1,7 @@
 version = 1
 SPDX-PackageName = "UI5 Webcomponents Sample with Vue"
 SPDX-PackageSupplier = "SAP OpenUI5 <openui5@sap.com>"
-SPDX-PackageDownloadLocation = "https://github.com/SAP-samples/ui5-webcomponents-sample-vue"
+SPDX-PackageDownloadLocation = "https://github.com/UI5/sample-webcomponents-vue"
 SPDX-PackageComment = "The code in this project may include calls to APIs (“API Calls”) of\n SAP or third-party products or services developed outside of this project\n (“External Products”).\n “APIs” means application programming interfaces, as well as their respective\n specifications and implementing code that allows software to communicate with\n other software.\n API Calls to External Products are not licensed under the open source license\n that governs this project. The use of such API Calls and related External\n Products are subject to applicable additional agreements with the relevant\n provider of the External Products. In no event shall the open source license\n that governs this project grant any rights in or to any External Products,or\n alter, expand or supersede any terms of the applicable additional agreements.\n If you have a valid license agreement with SAP for the use of a particular SAP\n External Product, then you may make use of any API Calls included in this\n project’s code for that SAP External Product, subject to the terms of such\n license agreement. If you do not have a valid license agreement for the use of\n a particular SAP External Product, then you may only make use of any API Calls\n in this project for that SAP External Product for your internal, non-productive\n and non-commercial test and evaluation of such API Calls. Nothing herein grants\n you any rights to use or access any SAP External Product, or provide any third\n parties the right to use of access any SAP External Product, through API Calls."
 
 [[annotations]]
diff --git a/src/App.vue b/src/App.vue
index 8821f30..aec0096 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -148,7 +148,7 @@
 			<b>Edition</b>: Enterprise <br>
 			<b>Admin version</b>: Vue Admin <br>
 			<hr />
-			<span class="help-dialog-text">For more information, please visit our <a href="https://github.com/SAP-samples/ui5-webcomponents-sample-vue" target="_blank">documentation</a>.</span>
+			<span class="help-dialog-text">For more information, please visit our <a href="https://github.com/UI5/sample-webcomponents-vue" target="_blank">documentation</a>.</span>
 		</p>
 
 		<div class="dialog-button">
diff --git a/vite.config.js b/vite.config.js
index f683659..94dfbdd 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -10,7 +10,7 @@ export default defineConfig({
         }
       }
   })],
-  base: process.env.NODE_ENV === 'production' ? '/ui5-webcomponents-sample-vue' : '/',
+  base: process.env.NODE_ENV === 'production' ? '/sample-webcomponents-vue' : '/',
   build: {
     rollupOptions: {
       output: {