diff --git a/Parchment-Common/pom.xml b/Parchment-Common/pom.xml
index 3316fbd..9f7dd84 100644
--- a/Parchment-Common/pom.xml
+++ b/Parchment-Common/pom.xml
@@ -19,8 +19,8 @@
     <description>Common utility files and interfaces for Parchment</description>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/patches/api/0005-Bump-to-Java-15.patch b/patches/api/0005-Bump-to-Java-15.patch
new file mode 100644
index 0000000..1ceef33
--- /dev/null
+++ b/patches/api/0005-Bump-to-Java-15.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: lexikiq <noellekiq@gmail.com>
+Date: Tue, 4 May 2021 13:02:02 -0400
+Subject: [PATCH] Bump to Java 15
+
+
+diff --git a/pom.xml b/pom.xml
+index 1edfbf2c99a1815f9f7aabbbcf11e45eceaea2e5..631a85808710691b96a61be064aaecc60e5974d8 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -19,8 +19,8 @@
+ 
+     <properties>
+         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
+-        <maven.compiler.source>1.8</maven.compiler.source>
+-        <maven.compiler.target>1.8</maven.compiler.target>
++        <maven.compiler.source>15</maven.compiler.source>
++        <maven.compiler.target>15</maven.compiler.target>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+         <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
+     </properties>
diff --git a/patches/server/0005-Bump-to-Java-15.patch b/patches/server/0005-Bump-to-Java-15.patch
new file mode 100644
index 0000000..2a6db55
--- /dev/null
+++ b/patches/server/0005-Bump-to-Java-15.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: lexikiq <noellekiq@gmail.com>
+Date: Tue, 4 May 2021 13:02:02 -0400
+Subject: [PATCH] Bump to Java 15
+
+
+diff --git a/pom.xml b/pom.xml
+index dde8ac8aadd56c411f72c12124dcf301ea50e169..731610f136521d984508796a9d9fcea7ed477fac 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -14,8 +14,8 @@
+         <bt.name>git</bt.name>
+         <minecraft.version>1.16.5</minecraft.version>
+         <minecraft_version>1_16_R3</minecraft_version>
+-        <maven.compiler.source>1.8</maven.compiler.source>
+-        <maven.compiler.target>1.8</maven.compiler.target>
++        <maven.compiler.source>15</maven.compiler.source>
++        <maven.compiler.target>15</maven.compiler.target>
+     </properties>
+ 
+     <parent>