diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8f206e648..dfe94f0f0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,7 +27,7 @@ If applicable, a snippet of the logs that seems relevant to the bug if present.
  - OS: [e.g. iOS]
 
 **Ombi Version (please complete the following information):**
- - Version [e.g. 3.0.1158]
+ - Version [e.g. 4.0.958]
 - Media Server [e.g. Plex]
 - Database Type: SQLite (Please change if using MySQL)
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 82f01f053..a9da96171 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Wiki
-    url: https://github.com/tidusjar/Ombi/wiki
-    about: The Ombi wiki should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
+  - name: Docs
+    url: https://docs.ombi.app/
+    about: The Ombi documentation should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
   - name: Reddit support
     url: https://www.reddit.com/r/Ombi
     about: Ask questions about Ombi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6febb6683..d4abf4412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -661,7 +661,7 @@
 
 - Added capture of anonymous analytical data. [tidusjar]
 
-- Added {AvailableDate} as a Notification Variable, this is the date the request was marked as available. See here: https://github.com/tidusjar/Ombi/wiki/Notification-Template-Variables. [tidusjar]
+- Added {AvailableDate} as a Notification Variable, this is the date the request was marked as available. See here: https://docs.ombi.app/info/notification-template-variables/. [tidusjar]
 
 - Added the ability to search movies via the movie db with a different language! [tidusjar]
 
diff --git a/README.md b/README.md
index 9e49ad62b..95e0480dc 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Here are some of the features Ombi has:
 # Installation
 
 [Installation Guide](https://docs.ombi.app/installation/)  
-[Here for Reverse Proxy Config Examples](https://docs.ombi.app/settings/reverse-proxy/)  
+[Here for Reverse Proxy Config Examples](https://docs.ombi.app/info/reverse-proxy/)  
 
 # Contributors
 
diff --git a/src/Ombi.Helpers/PlexHelper.cs b/src/Ombi.Helpers/PlexHelper.cs
index 4dbde0c92..08548b8c9 100644
--- a/src/Ombi.Helpers/PlexHelper.cs
+++ b/src/Ombi.Helpers/PlexHelper.cs
@@ -42,7 +42,7 @@ namespace Ombi.Helpers
             //com.plexapp.agents.themoviedb://390043?lang=en
             //com.plexapp.agents.imdb://tt2543164?lang=en
             //plex://movie/5e1632df2d4d84003e48e54e
-            // https://github.com/tidusjar/Ombi/issues/3277
+            // https://github.com/Ombi-app/Ombi/issues/3277
             if (string.IsNullOrEmpty(guid))
             {
                 return new ProviderId();
diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.html b/src/Ombi/ClientApp/src/app/settings/about/about.component.html
index a9e1028d1..76776f476 100644
--- a/src/Ombi/ClientApp/src/app/settings/about/about.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.html
@@ -1,4 +1,4 @@
-<settings-menu></settings-menu>
+<settings-menu></settings-menu>
 <div *ngIf="about" class="small-middle-container">
   <legend>About</legend>
 <div class="row">
@@ -41,14 +41,14 @@
 
     <div class="mat-row">
       <div class="mat-cell">Issues</div>
-      <div class="mat-cell"> <a href="https://github.com/tidusjar/Ombi/issues"
-          target="_blank">https://github.com/tidusjar/Ombi/issues</a></div>
+      <div class="mat-cell"> <a href="https://github.com/Ombi-app/Ombi/issues"
+          target="_blank">https://github.com/Ombi-app/Ombi/issues</a></div>
     </div>
 
     <div class="mat-row">
       <div class="mat-cell">Wiki</div>
-      <div class="mat-cell"> <a href="https://github.com/tidusjar/Ombi/wiki"
-          target="_blank">https://github.com/tidusjar/Ombi/wiki</a></div>
+      <div class="mat-cell"> <a href="https://docs.ombi.app"
+          target="_blank">https://docs.ombi.app</a></div>
     </div>
 
     <div class="mat-row">
diff --git a/src/Ombi/ClientApp/src/app/settings/update/update.component.html b/src/Ombi/ClientApp/src/app/settings/update/update.component.html
index 52cf9c19e..d99cccf05 100644
--- a/src/Ombi/ClientApp/src/app/settings/update/update.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/update/update.component.html
@@ -1,6 +1,6 @@
-
+
 <settings-menu></settings-menu>
-<wiki [path]="'https://github.com/tidusjar/Ombi/wiki/Update-Settings'"></wiki>
+<wiki [path]="'https://docs.ombi.app/guides/updating/'"></wiki>
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Update Settings</legend>