diff --git a/src/components/FileBar.vue b/src/components/FileBar.vue
index 4b82ff2..74a23a8 100644
--- a/src/components/FileBar.vue
+++ b/src/components/FileBar.vue
@@ -230,16 +230,16 @@ export default {
       let url;
       switch (mode) {
         case "github":
-          url = "https://github.com/wh1te909/tacticalrmm/";
+          url = "https://github.com/amidaware/tacticalrmm/";
           break;
         case "docs":
-          url = "https://wh1te909.github.io/tacticalrmm/";
+          url = "https://docs.tacticalrmm.com";
           break;
         case "bug":
-          url = "https://github.com/wh1te909/tacticalrmm/issues/new?template=bug_report.md";
+          url = "https://github.com/amidaware/tacticalrmm/issues/new?template=bug_report.md";
           break;
         case "feature":
-          url = "https://github.com/wh1te909/tacticalrmm/issues/new?template=feature_request.md";
+          url = "https://github.com/amidaware/tacticalrmm/issues/new?template=feature_request.md";
           break;
         case "discord":
           url = "https://discord.gg/upGTkWp";
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 614c07d..8d75cc5 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -138,7 +138,7 @@ export default {
 
     const latestReleaseURL = computed(() => {
       return latestTRMMVersion.value
-        ? `https://github.com/wh1te909/tacticalrmm/releases/tag/v${latestTRMMVersion.value}`
+        ? `https://github.com/amidaware/tacticalrmm/releases/tag/v${latestTRMMVersion.value}`
         : "";
     });