diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 118587409..ba67e0575 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -72,4 +72,4 @@ npm run test
 
 Additional language translations, or improvements to existing translations are most welcome.  Translations can be found here: 
 
-https://github.com/oznu/homebridge-config-ui-x/tree/master/ui/src/i18n
+https://github.com/homebridge/homebridge-config-ui-x/tree/master/ui/src/i18n
diff --git a/README.md b/README.md
index 39ddb4c5a..9d9d858ce 100755
--- a/README.md
+++ b/README.md
@@ -140,4 +140,4 @@ Join the [Official Homebridge Discord](https://discord.gg/C87Pvq3) community and
 
 # Credit
 
-Homebridge Config UiI X was originally created by [Oznu](https://github.com/oznu).
+Homebridge Config UI X was originally created by [oznu](https://github.com/oznu).
diff --git a/src/bin/platforms/win32.ts b/src/bin/platforms/win32.ts
index 95c2697a5..7da16372a 100644
--- a/src/bin/platforms/win32.ts
+++ b/src/bin/platforms/win32.ts
@@ -146,7 +146,7 @@ export class Win32Installer extends BasePlatform {
    * This is used to create the Windows Services
    */
   private async downloadNssm(): Promise<string> {
-    const downloadUrl = `https://github.com/oznu/nssm/releases/download/2.24-101-g897c7ad/nssm_${os.arch()}.exe`;
+    const downloadUrl = `https://github.com/homebridge/nssm/releases/download/2.24-101-g897c7ad/nssm_${os.arch()}.exe`;
     const nssmPath = path.resolve(this.hbService.storagePath, 'nssm.exe');
 
     if (await fs.pathExists(nssmPath)) {
diff --git a/src/modules/log/log.service.ts b/src/modules/log/log.service.ts
index 031e03d56..ef904db4a 100644
--- a/src/modules/log/log.service.ts
+++ b/src/modules/log/log.service.ts
@@ -101,7 +101,7 @@ export class LogService {
           client.emit('stdout', '\n\r');
           client.emit('stdout', color.red(`The log tail command "${command.join(' ')}" exited with code ${code.exitCode}.\n\r`));
           client.emit('stdout', color.red('Please check the command in your config.json is correct.\n\r\n\r'));
-          client.emit('stdout', color.cyan('See https://github.com/oznu/homebridge-config-ui-x#log-viewer-configuration for instructions.\r\n'));
+          client.emit('stdout', color.cyan('See https://github.com/homebridge/homebridge-config-ui-x/wiki/Manual-Configuration#log-viewer-configuration for instructions.\r\n'));
         }
       } catch (e) {
         // the client socket probably closed
diff --git a/src/modules/plugins/plugins.service.ts b/src/modules/plugins/plugins.service.ts
index 60d003e9c..3f9ff646d 100755
--- a/src/modules/plugins/plugins.service.ts
+++ b/src/modules/plugins/plugins.service.ts
@@ -646,7 +646,7 @@ export class PluginsService {
       pluginAction.version !== 'latest'
     ) {
       try {
-        await this.httpService.head(`https://github.com/oznu/homebridge-config-ui-x/releases/download/${pluginAction.version}/homebridge-config-ui-x-${pluginAction.version}.tar.gz`).toPromise();
+        await this.httpService.head(`https://github.com/homebridge/homebridge-config-ui-x/releases/download/${pluginAction.version}/homebridge-config-ui-x-${pluginAction.version}.tar.gz`).toPromise();
         return true;
       } catch (e) {
         return false;
@@ -1252,7 +1252,7 @@ export class PluginsService {
         client.emit('stdout', `${path.resolve(cwd, 'node_modules')}\n\r\n\r`);
         client.emit('stdout', color.yellow('This may cause the operation to fail.\n\r'));
         client.emit('stdout', color.yellow('See the docs for details on how to enable sudo mode:\n\r'));
-        client.emit('stdout', color.yellow('https://github.com/oznu/homebridge-config-ui-x#sudo-mode\n\r\n\r'));
+        client.emit('stdout', color.yellow('https://github.com/homebridge/homebridge-config-ui-x/wiki/Manual-Configuration#sudo-mode\n\r\n\r'));
       }
     }
 
diff --git a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html
index 053216664..1924098ab 100644
--- a/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html
+++ b/ui/src/app/core/manage-plugins/custom-plugins/homebridge-google-smarthome/homebridge-google-smarthome.component.html
@@ -15,8 +15,8 @@ <h5 class="modal-title">Homebridge Google Smart Home</h5>
         <p class="mb-0">
           <span [translate]="'accessories.message_please_see'">Please see</span>
           <a target="_blank" rel="noopener noreferrer"
-            href="https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
-            https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
+            href="https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
+            https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
           </a>
           <span [translate]="'accessories.message_for_more_information'">for more information.</span>
         </p>
diff --git a/ui/src/app/modules/accessories/accessories.component.html b/ui/src/app/modules/accessories/accessories.component.html
index 4b29c94f6..ea992b6ca 100644
--- a/ui/src/app/modules/accessories/accessories.component.html
+++ b/ui/src/app/modules/accessories/accessories.component.html
@@ -63,8 +63,8 @@ <h3 class="primary-text" [translate]="'accessories.title_accessory_control_disab
         <p>
           <span [translate]="'accessories.message_please_see'">Please see</span>
           <a target="_blank" rel="noopener noreferrer"
-            href="https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
-            https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
+            href="https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
+            https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
           </a>
           <span [translate]="'accessories.message_for_more_information'">for more information.</span>
         </p>
diff --git a/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html b/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html
index 35bc1d696..36d45ce12 100644
--- a/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html
+++ b/ui/src/app/modules/plugins/donate-modal/donate-modal.component.html
@@ -22,7 +22,7 @@
     <div class="modal-footer">
       <div class="w-100 text-right">
         <p class="small mb-0">
-          <a class="font-italic" href="https://github.com/oznu/homebridge-config-ui-x/wiki/Developers:-Donation-Links"
+          <a class="font-italic" href="https://github.com/homebridge/homebridge-config-ui-x/wiki/Developers:-Donation-Links"
             target="_blank" rel="noopener noreferrer" translate="plugins.donate.message_learn_more">
           </a>
         </p>
diff --git a/ui/src/app/modules/status/status.component.html b/ui/src/app/modules/status/status.component.html
index 8d8d3e5b4..f0a3d4642 100644
--- a/ui/src/app/modules/status/status.component.html
+++ b/ui/src/app/modules/status/status.component.html
@@ -35,7 +35,7 @@
     <div class="col-md-12 text-center mb-3 grey-text">
       <small>
         <a class="grey-text" target="_blank" rel="noopener noreferrer"
-          href="https://github.com/oznu/homebridge-config-ui-x">{{ $settings.env.packageName }}
+          href="https://github.com/homebridge/homebridge-config-ui-x">{{ $settings.env.packageName }}
           v{{ $settings.env.packageVersion }}</a>
         -
       </small>
diff --git a/upgrade-install.sh b/upgrade-install.sh
index 51f8a3078..a5c25f293 100755
--- a/upgrade-install.sh
+++ b/upgrade-install.sh
@@ -28,7 +28,7 @@ fi
 
 echo "Downloading SHASUMS256.txt..."
 curl -fsSL# -o "$tmp_dir/SHASUMS256.txt" \
-  https://github.com/oznu/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/SHASUMS256.txt
+  https://github.com/homebridge/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/SHASUMS256.txt
 if [ "$?" != "0" ]; then
   echo "Failed to download SHASUMS256.txt"
   exit 1
@@ -36,7 +36,7 @@ fi
 
 echo "Downloading homebridge-config-ui-x-${TARGET_VERSION}.tar.gz..."
 curl -fL# -o "$tmp_dir/homebridge-config-ui-x-${TARGET_VERSION}.tar.gz" \
-  https://github.com/oznu/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/homebridge-config-ui-x-${TARGET_VERSION}.tar.gz
+  https://github.com/homebridge/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/homebridge-config-ui-x-${TARGET_VERSION}.tar.gz
 if [ "$?" != "0" ]; then
   echo "Failed to download homebridge-config-ui-x-${TARGET_VERSION}.tar.gz"
   exit 1