diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 0bf52729c..2caf583d0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,7 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
-        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://wiki.intellectualsites.com/PlotSquared).
+        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki).
 
   - type: dropdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index ac267d10a..0d20c325a 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
     url: https://discord.gg/intellectualsites
     about: Our support Discord, please ask questions and seek support here.
   - name: PlotSquared Wiki
-    url: https://wiki.intellectualsites.com/PlotSquared
+    url: https://github.com/IntellectualSites/PlotSquared/wiki
     about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 18bb172e6..1d30e6ecc 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,7 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
-        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://wiki.intellectualsites.com/PlotSquared).
+        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki).
 
   - type: textarea
     attributes:
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
index e88869ead..1028ea2e5 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
@@ -103,7 +103,7 @@ public class DebugPaste extends SubCommand {
                 b.append("OS Arch: ").append(System.getProperty("os.arch")).append('\n');
                 b.append("# Okay :D Great. You are now ready to create your bug report!");
                 b.append(
-                    "\n# You can do so at https://issues.intellectualsites.com/projects/ps");
+                    "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
                 b.append("\n# or via our Discord at https://discord.gg/intellectualsites");
 
                 final IncendoPaster incendoPaster = new IncendoPaster("plotsquared");
diff --git a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
index 0165a916f..07ca09329 100644
--- a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
@@ -47,7 +47,7 @@ public class PluginCmd extends SubCommand {
             MainUtil.sendMessage(player,
                 "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault $2& $1SirYwell");
             MainUtil.sendMessage(player,
-                "$2>> $1&lWiki$2: $1https://wiki.intellectualsites.com/plotsquared/home");
+                "$2>> $1&lWiki$2: $1https://github.com/IntellectualSites/PlotSquared/wiki");
             MainUtil
                 .sendMessage(player, "$2>> $1&lPremium$2: $1" + PremiumVerification.isPremium());
         });
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
index c5efe94df..1b568fe69 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@@ -208,7 +208,7 @@ public class Settings extends Config {
         public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
 
 
-        @Comment("See: https://wiki.intellectualsites.com/en/plotsquared/optimization/plot-analysis for a description of each value.")
+        @Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis for a description of each value.")
         public static final class CALIBRATION {
             public int VARIETY = 0;
             public int VARIETY_SD = 0;
@@ -225,7 +225,7 @@ public class Settings extends Config {
 
 
     @Comment({"Chunk processor related settings",
-        "See https://wiki.intellectualsites.com/en/plotsquared/optimization/chunk-processor for more information."})
+        "See https://github.com/IntellectualSites/PlotSquared/wiki/Chunk-processor for more information."})
     public static class Chunk_Processor {
         @Comment("Auto trim will not save chunks which aren't claimed") public static boolean
             AUTO_TRIM = false;
@@ -276,7 +276,7 @@ public class Settings extends Config {
         @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
         @Comment("Replace wall when merging") public static boolean MERGE_REPLACE_WALL = true;
         @Comment({"Blocks that may not be used in plot components",
-        "Checkout the wiki article regarding plot components before modifying: https://wiki.intellectualsites.com/en/plotsquared/installation/plot-components"}) public static List<String>
+        "Checkout the wiki article regarding plot components before modifying: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"}) public static List<String>
             INVALID_BLOCKS = Arrays.asList(
             // Acacia Stuff
             "acacia_button", "acacia_fence_gate", "acacia_door", "acacia_pressure_plate",
@@ -391,7 +391,7 @@ public class Settings extends Config {
 
 
     @Comment({"Schematic Settings",
-            "See https://wiki.intellectualsites.com/en/plotsquared/schematics/on-claim for more information."})
+            "See https://github.com/IntellectualSites/PlotSquared/wiki/Schematic-on-Claim for more information."})
     public static final class Schematics {
         @Comment(
             "Whether schematic based generation should paste schematic on top of plots, or from Y=1")
@@ -457,7 +457,7 @@ public class Settings extends Config {
 
 
     @Comment({"Backup related settings",
-            "See https://wiki.intellectualsites.com/en/plotsquared/backups for more information."})
+            "See https://github.com/IntellectualSites/PlotSquared/wiki/Backups for more information."})
     public static final class Backup {
         @Comment("Automatically backup plots when destructive commands are performed, e.g. /plot clear")
         public static boolean AUTOMATIC_BACKUPS = true;
@@ -586,7 +586,7 @@ public class Settings extends Config {
         @Comment("Make road regeneration persistent across restarts") public static boolean
             PERSISTENT_ROAD_REGEN = false;
         @Comment({"Enable the `/plot component` preset GUI",
-        "Read more about components here: https://wiki.intellectualsites.com/en/plotsquared/installation/plot-components"}) public static boolean COMPONENT_PRESETS = true;
+        "Read more about components here: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"}) public static boolean COMPONENT_PRESETS = true;
         @Comment("Use UUID cache to complete usernames")
         public static boolean EXTENDED_USERNAME_COMPLETION = true;
         @Comment("Command aliases that will be tab completed")
diff --git a/README.md b/README.md
index aea90c822..41a5c4179 100644
--- a/README.md
+++ b/README.md
@@ -27,14 +27,14 @@ is to provide a lag-free and smooth experience.
 
 * [Download](https://www.spigotmc.org/resources/77506/)
 * [Discord](https://discord.gg/intellectualsites)
-* [Wiki](https://wiki.intellectualsites.com/plotsquared/home)
+* [Wiki](https://github.com/IntellectualSites/PlotSquared/wiki)
 * [Issues](https://github.com/IntellectualSites/PlotSquared/issues)
 * [Translations](https://intellectualsites.crowdin.com/plotsquared/)
 
 ### Developer Resources
-* [API Documentation](https://wiki.intellectualsites.com/en/plotsquared/developer/development-portal)
-* [Event API](https://wiki.intellectualsites.com/en/plotsquared/developer/events)
-* [Flag API](https://wiki.intellectualsites.com/en/plotsquared/developer/flags)
+* [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/API-Documentation)
+* [Event API](https://github.com/IntellectualSites/PlotSquared/wiki/Events)
+* [Flag API](https://github.com/IntellectualSites/PlotSquared/wiki/API-Flag)
 
 # Building
 Gradle is the **recommended** way to build the project. Use `./gradlew build` in the main project directory to build the project. Gradle is required if you intend to build or develop the Sponge module.