diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 30ad54fed3..b8df4a4c54 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 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06eb7d4121 100644
+index 56c23681feafa2760740ad03cb7f5f274df6e20d..b8c8dc1a06a8ed93fccd419155fc9403805ea2fa 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -28,7 +28,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
          <minecraft.version>1.16.2</minecraft.version>
-@@ -19,16 +18,22 @@
+@@ -19,21 +18,27 @@
      </properties>
  
      <parent>
@@ -46,15 +46,21 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
 -            <artifactId>spigot-api</artifactId>
 +            <groupId>com.destroystokyo.paper</groupId>
 +            <artifactId>paper-api</artifactId>
+             <version>${project.version}</version>
+             <scope>compile</scope>
+         </dependency>
+         <dependency>
+-            <groupId>org.spigotmc</groupId>
++            <groupId>com.destroystokyo.paper</groupId>
++            <artifactId>paper-mojangapi</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
-+            <groupId>com.destroystokyo.paper</groupId>
-+            <artifactId>paper-mojangapi</artifactId>
-             <version>${project.version}</version>
++            <groupId>io.papermc</groupId>
+             <artifactId>minecraft-server</artifactId>
+             <version>${minecraft.version}-SNAPSHOT</version>
              <scope>compile</scope>
-         </dependency>
 @@ -50,6 +55,17 @@
              <version>8.0.1</version>
              <scope>compile</scope>
@@ -100,8 +106,7 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
-+                        <phase>compile</phase>
-                         <goals>
+-                        <goals>
 -                            <goal>describe</goal>
 -                        </goals>
 -                    </execution>
@@ -113,7 +118,8 @@ index 56c23681feafa2760740ad03cb7f5f274df6e20d..3dfb494e1f09da7a6ebf6c740d4e9e06
 -                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
--                        <goals>
++                        <phase>compile</phase>
+                         <goals>
 -                            <goal>describe</goal>
 +                            <goal>gitdescribe</goal>
                          </goals>
diff --git a/scripts/remap.sh b/scripts/remap.sh
index 0d9d64d4bb..cc689aae28 100755
--- a/scripts/remap.sh
+++ b/scripts/remap.sh
@@ -72,7 +72,7 @@ fi
 
 echo "Installing remapped jar..."
 cd "$workdir/CraftBukkit" # Need to be in a directory with a valid POM at the time of install.
-mvn install:install-file -q -Dfile="$jarpath-mapped.jar" -Dpackaging=jar -DgroupId=org.spigotmc -DartifactId=minecraft-server -Dversion="$minecraftversion-SNAPSHOT"
+mvn install:install-file -q -Dfile="$jarpath-mapped.jar" -Dpackaging=jar -DgroupId=io.papermc -DartifactId=minecraft-server -Dversion="$minecraftversion-SNAPSHOT"
 if [ "$?" != "0" ]; then
     echo "Failed to install remapped jar."
     exit 1