diff --git a/README.md b/README.md
index d04d2d1fd..593084e44 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,8 @@ Join us on [Discord](https://discord.gg/mtAAnkk)
 Downloads can be obtained from the [downloads page](https://purpurmc.org/downloads/) or the [downloads API](https://api.purpurmc.org).
 
 Latest build shortcut links:
-* [1.17.1](https://api.purpurmc.org/v1/purpur/1.17.1/latest/download) builds 1256+
+* [1.18](https://purpurmc.org/downloads/1.18/latest/download) builds 1429+
+* [1.17.1](https://api.purpurmc.org/v1/purpur/1.17.1/latest/download) builds 1256-1428
 * [1.17](https://api.purpurmc.org/v1/purpur/1.17/latest/download) builds 1172-1255
 * [1.16.5](https://api.purpurmc.org/v1/purpur/1.16.5/latest/download) builds 957-1171
 * [1.16.4](https://api.purpurmc.org/v1/purpur/1.16.4/latest/download) builds 809-956
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index ba7a33e49..3207e0cd2 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -173,7 +173,7 @@ index 450518903c0a10301b177d8dd7fe05aca3b8b37e..a10cebac752fdf5186eb86bd314f1931
                          .withRequiredArg()
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..015428a85dc0f3e6cdd3a4aae405db80aa2a12e8
+index 0000000000000000000000000000000000000000..fdfb20170c27711085aa0772866876035e0d98c2
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -0,0 +1,159 @@
@@ -220,7 +220,7 @@ index 0000000000000000000000000000000000000000..015428a85dc0f3e6cdd3a4aae405db80
 +
 +    private static Map<String, Command> commands;
 +
-+    static int version;
++    public static int version;
 +    static boolean verbose;
 +
 +    public static void init(File configFile) {
@@ -240,8 +240,8 @@ index 0000000000000000000000000000000000000000..015428a85dc0f3e6cdd3a4aae405db80
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 22);
-+        set("config-version", 22);
++        version = getInt("config-version", 23);
++        set("config-version", 23);
 +
 +        readConfig(PurpurConfig.class, null);
 +    }
diff --git a/patches/server/0008-Timings-stuff.patch b/patches/server/0008-Timings-stuff.patch
index 57d01f68c..120e1f159 100644
--- a/patches/server/0008-Timings-stuff.patch
+++ b/patches/server/0008-Timings-stuff.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Timings stuff
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index ee53453440177537fc653ea156785d7591498614..b4ccd80663feed1b1e9d02806dcffd0bba8930e1 100644
+index 5e3b7fb2e0b7608610555cd23e7ad25a05883181..52197656e46fd159240a936fe13bfb27f2b4e9a7 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -225,9 +225,14 @@ public class TimingsExport extends Thread {
@@ -46,20 +46,32 @@ index ee53453440177537fc653ea156785d7591498614..b4ccd80663feed1b1e9d02806dcffd0b
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cdf0f5cafd39a874ea09fdb35b237e3c59c226d9..8087c4d63f1d5768dd786a152eca5d00231fe529 100644
+index cd918cec00d8202252af0d20b1a8891371c538e3..be06b781587f9593944a967b1d1ad4bcd4086284 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -233,7 +233,7 @@ public class PaperConfig {
-     private static void timings() {
+@@ -13,6 +13,7 @@ import java.nio.charset.StandardCharsets;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
++import java.util.Objects;
+ import java.util.concurrent.TimeUnit;
+ import java.util.logging.Level;
+ import java.util.regex.Pattern;
+@@ -234,6 +235,12 @@ public class PaperConfig {
          boolean timings = getBoolean("timings.enabled", true);
          boolean verboseTimings = getBoolean("timings.verbose", true);
--        TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
-+        TimingsManager.url = getString("timings.url", "https://timings.pl3x.net/");
+         TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
++        // Purpur start
++        if (org.purpurmc.purpur.PurpurConfig.version < 23 && TimingsManager.url.contains("timings.pl3x.net")) {
++            set("timings.url", "https://timings.aikar.co/");
++            TimingsManager.url = "https://timings.aikar.co/";
++        }
++        // Purpur end
          if (!TimingsManager.url.endsWith("/")) {
              TimingsManager.url += "/";
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f5cdf3338411650add4a2eb41e0412182b1f6fdf..8747593597ed270400ef3d3f6b141a0fb370f1b4 100644
+index 5350ffab8477a2da4891132cf8b7a65cf776574b..c19f962794a1fed3292dc7ed90e11829c3b37a6c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -161,4 +161,17 @@ public class PurpurConfig {