diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 656f4c3a01..bbf3917f3b 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index ebce3da9abf550089ead322bc2cef359c803a434..ab48b2102727d741ab3f0c8daa658593e1305a3b 100644
+index ebce3da9abf550089ead322bc2cef359c803a434..5710dd02c80bc713e5dd289c9aa4bc21fd0f4318 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -115,6 +115,15 @@ index ebce3da9abf550089ead322bc2cef359c803a434..ab48b2102727d741ab3f0c8daa658593
          <!-- deprecated API depend -->
          <dependency>
              <groupId>com.googlecode.json-simple</groupId>
+@@ -80,7 +105,7 @@
+         <dependency>
+             <groupId>mysql</groupId>
+             <artifactId>mysql-connector-java</artifactId>
+-            <version>5.1.49</version>
++            <version>8.0.23</version>
+             <scope>runtime</scope>
+         </dependency>
+         <!-- testing -->
 @@ -100,34 +125,22 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
diff --git a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
index d50f07ad18..5a713e01e5 100644
--- a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index ab48b2102727d741ab3f0c8daa658593e1305a3b..38e78762528182bbe676ce3ad5a437680b5b7307 100644
+index 5710dd02c80bc713e5dd289c9aa4bc21fd0f4318..e0fcbe1b13a5ec1244d6d904ca76336a47967c9b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -57,10 +57,26 @@
diff --git a/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 2ec0ae4c2d..66d9ef47f0 100644
--- a/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 38e78762528182bbe676ce3ad5a437680b5b7307..6f96ce455f047073c124d13c54e3a77455ddd980 100644
+index e0fcbe1b13a5ec1244d6d904ca76336a47967c9b..70a7778ae19941bb78b8669b1429cb3d525f58a4 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -76,7 +76,7 @@
diff --git a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
index 74088bbe69..395d0aac73 100644
--- a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 6f96ce455f047073c124d13c54e3a77455ddd980..bb15d94f1aadf04439f0b9484f91a81440194c43 100644
+index 70a7778ae19941bb78b8669b1429cb3d525f58a4..3ebdf97dd88e9461331434da4a8cd02bd25148ca 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -83,6 +83,11 @@
diff --git a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
index e13d56e37a..10fdc401da 100644
--- a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index bb15d94f1aadf04439f0b9484f91a81440194c43..526a261e93f8be8d2f045d1b8822002b55c11fb9 100644
+index 3ebdf97dd88e9461331434da4a8cd02bd25148ca..325dc0a46666d5e0cd050fd1fb793c08866c2a43 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -93,6 +93,13 @@
diff --git a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
index c3df8c92e0..973a6097e3 100644
--- a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index 526a261e93f8be8d2f045d1b8822002b55c11fb9..eed1dccb481a300b9f4679af157ce512c70cf34a 100644
+index 325dc0a46666d5e0cd050fd1fb793c08866c2a43..ab57297272c2d6f3d21067081bcaf8775b8fff09 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -149,6 +149,13 @@