diff --git a/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch b/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch
index 5bd3467..cbb706d 100644
--- a/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch
+++ b/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch
@@ -1,4 +1,4 @@
-From f8f184cb101633ece93dd65d1d7cf8f54d41ebe5 Mon Sep 17 00:00:00 2001
+From 6b7dd2468dbdf6289bf10352dd4f96b70fa39483 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall CI
@@ -6,7 +6,7 @@ Subject: [PATCH] Fetch modules from the Waterfall CI
 Don't fetch from the BungeeCord CI, as that only has their modules
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
-index 2536435c..e1cf0010 100644
+index 2536435c..9b20d0df 100644
 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 @@ -1,10 +1,10 @@
@@ -27,7 +27,7 @@ index 2536435c..e1cf0010 100644
          try
          {
 -            URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
-+            URL website = new URL( "https://ci.destroystokyo.com/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
++            URL website = new URL( "https://papermc.io/ci/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
              URLConnection con = website.openConnection();
              // 15 second timeout at various stages
              con.setConnectTimeout( 15000 );
@@ -40,5 +40,5 @@ index 2536435c..e1cf0010 100644
          } catch ( IOException ex )
          {
 -- 
-2.19.0
+2.20.1
 
diff --git a/BungeeCord-Patches/0035-Improve-outdated-build-message.patch b/BungeeCord-Patches/0035-Improve-outdated-build-message.patch
index 7baad9b..190a6c7 100644
--- a/BungeeCord-Patches/0035-Improve-outdated-build-message.patch
+++ b/BungeeCord-Patches/0035-Improve-outdated-build-message.patch
@@ -1,11 +1,11 @@
-From 0d2024006bef83ca8ead4c18e644db6caf406fd2 Mon Sep 17 00:00:00 2001
+From 73a8aa42b159f0d2c1e0b0f1ade0e52f7c5a2b93 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 20681838..31cde42d 100644
+index 20681838..e615f1ff 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 @@ -42,9 +42,9 @@ public class BungeeCordLauncher
@@ -16,7 +16,7 @@ index 20681838..31cde42d 100644
 -                System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
 -                System.err.println( "*** You will get NO support regarding this build ***" );
 +                System.err.println( "*** Hey! This build is potentially outdated :( ***" );
-+                System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
++                System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Waterfall/ ***" );
 +                System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" );
                  System.err.println( "*** Server will start in 10 seconds ***" );
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
diff --git a/README.md b/README.md
index d2d8537..dfd22b3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Waterfall [![Build Status](https://ci.destroystokyo.com/job/Waterfall/badge/icon)](https://ci.destroystokyo.com/job/Waterfall/)
+Waterfall [![Build Status](https://papermc.io/ci/job/Waterfall/badge/icon)](https://papermc.io/ci/job/Waterfall/)
 =========
 
 Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite.