diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index f667c61..f37222f 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [15]
+        java: [16]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/push-build.yml b/.github/workflows/push-build.yml
index f08c7b3..079761b 100644
--- a/.github/workflows/push-build.yml
+++ b/.github/workflows/push-build.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [15]
+        java: [16]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/Parchment-Common/pom.xml b/Parchment-Common/pom.xml
index b3d83c1..ce9960d 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>15</maven.compiler.source>
-        <maven.compiler.target>15</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/patches/api/0004-Update-to-Java-15.patch b/patches/api/0004-Update-to-Java-16.patch
similarity index 92%
rename from patches/api/0004-Update-to-Java-15.patch
rename to patches/api/0004-Update-to-Java-16.patch
index e133a6f..93d0802 100644
--- a/patches/api/0004-Update-to-Java-15.patch
+++ b/patches/api/0004-Update-to-Java-16.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: lexikiq <noellekiq@gmail.com>
 Date: Sun, 9 May 2021 17:03:09 -0400
-Subject: [PATCH] Update to Java 15
+Subject: [PATCH] Update to Java 16
 
 
 diff --git a/pom.xml b/pom.xml
-index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285ae4e4be46 100644
+index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..fcb44552c21168bbefcbea7f04c1f1aa45f5f4dc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -19,8 +19,10 @@
@@ -15,8 +15,8 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
 -        <maven.compiler.source>1.8</maven.compiler.source>
 -        <maven.compiler.target>1.8</maven.compiler.target>
 +        <!-- Parchment start -->
-+        <maven.compiler.source>15</maven.compiler.source>
-+        <maven.compiler.target>15</maven.compiler.target>
++        <maven.compiler.source>16</maven.compiler.source>
++        <maven.compiler.target>16</maven.compiler.target>
 +        <!-- Parchment end -->
          <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! -->
diff --git a/patches/server/0005-Bump-to-Java-15.patch b/patches/server/0005-Bump-to-Java-16.patch
similarity index 67%
rename from patches/server/0005-Bump-to-Java-15.patch
rename to patches/server/0005-Bump-to-Java-16.patch
index 2a6db55..3534cd0 100644
--- a/patches/server/0005-Bump-to-Java-15.patch
+++ b/patches/server/0005-Bump-to-Java-16.patch
@@ -1,11 +1,11 @@
 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
+Subject: [PATCH] Bump to Java 16
 
 
 diff --git a/pom.xml b/pom.xml
-index dde8ac8aadd56c411f72c12124dcf301ea50e169..731610f136521d984508796a9d9fcea7ed477fac 100644
+index dde8ac8aadd56c411f72c12124dcf301ea50e169..1effeb293e9e404b7712487a8c88f1c8ef4d6e6b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -14,8 +14,8 @@
@@ -14,8 +14,8 @@ index dde8ac8aadd56c411f72c12124dcf301ea50e169..731610f136521d984508796a9d9fcea7
          <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>
++        <maven.compiler.source>16</maven.compiler.source>
++        <maven.compiler.target>16</maven.compiler.target>
      </properties>
  
      <parent>