diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 52950142e8..c6e0fac177 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -22,7 +22,7 @@ index 186405ba1914b2b384896c61770c225b50091401..9975ba9ae19f6217bec206fee247fac1
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.15.2-R0.1-SNAPSHOT</version>
+     <version>1.16-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index d0e2a70921..e88b4595f9 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -16,7 +16,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..3554314526b3f33ad02df2adfd42d451
 -    <artifactId>spigot</artifactId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.15.2-R0.1-SNAPSHOT</version>
+     <version>1.16-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 +    <name>Paper</name>
@@ -27,7 +27,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..3554314526b3f33ad02df2adfd42d451
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
-         <minecraft.version>1.15.2</minecraft.version>
+         <minecraft.version>1.16</minecraft.version>
 @@ -19,16 +18,22 @@
      </properties>
  
diff --git a/Spigot-Server-Patches/0402-Fix-MC-161754.patch b/Spigot-Server-Patches/0402-Fix-MC-161754.patch
index 9ba10c6d76..4e725ed021 100644
--- a/Spigot-Server-Patches/0402-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0402-Fix-MC-161754.patch
@@ -17,7 +17,7 @@ index c95ce0124d948626732e796c386b7544e34b36c4..18e1ae7f0a4b06ec7d7400e791ac79e5
      @Override
      public boolean canUse(EntityHuman entityhuman) {
 -        return this.c.a(entityhuman) && this.d.isAlive() && this.d.g((Entity) entityhuman) < 8.0F;
-+        return this.c.a(entityhuman) && (this.d.isAlive() && this.d.valid) && this.d.g((Entity) entityhuman) < 8.0F; // Paper - Fix MC-161754
++        return this.c.a(entityhuman) && (this.d.isAlive() && this.d.valid) && this.d.g((Entity) entityhuman) < 8.0F; // Paper - Fix MC-161754 - evaluate we might still want this in 1.16 as im not confident mojang fixed this, and made it worse
      }
  
      @Override
diff --git a/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/removed/1.16/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to removed/1.16/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
diff --git a/Spigot-Server-Patches/0468-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch b/removed/1.16/0468-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
rename to removed/1.16/0468-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh
index e4c073fda2..e700fde80b 100755
--- a/scripts/applyPatches.sh
+++ b/scripts/applyPatches.sh
@@ -39,6 +39,7 @@ function applyPatch {
 
     statusfile=".git/patch-apply-failed"
     rm -f "$statusfile"
+    git config commit.gpgsign false
     $gitcmd am --abort >/dev/null 2>&1
 
     # Special case Windows handling because of ARG_MAX constraint