diff --git a/pom.xml b/pom.xml
index 311a671..1f5bf1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <!-- Spigot repo -->
     <repository>
       <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
     </repository>
 
     <!-- JitPack for Vault -->
@@ -85,11 +85,11 @@
   </repositories>
 
   <dependencies>
-    <!-- Spigot-Bukkit API -->
+    <!-- Spigot API -->
     <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.13-R0.1-SNAPSHOT</version>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.17-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/main/java/com/garbagemule/MobArena/MAUtils.java b/src/main/java/com/garbagemule/MobArena/MAUtils.java
index b29729b..771a393 100644
--- a/src/main/java/com/garbagemule/MobArena/MAUtils.java
+++ b/src/main/java/com/garbagemule/MobArena/MAUtils.java
@@ -274,7 +274,7 @@ public class MAUtils
         // Place the hippie signs
         //Iterator<String> iterator = am.getClasses().iterator();
         Iterator<ArenaClass> iterator = am.getClasses().values().iterator();
-        Rotatable signData = (Rotatable) Material.SIGN.createBlockData();
+        Rotatable signData = (Rotatable) Material.OAK_SIGN.createBlockData();
         signData.setRotation(BlockFace.NORTH);
         for (int i = lx1+2; i <= lx2-2; i++) // Signs
         {
diff --git a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java
index 29936cb..6561f0b 100644
--- a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java
+++ b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java
@@ -59,7 +59,7 @@ public class ClassChests {
         Block blockBehind = blockBelow.getRelative(backwards);
 
         // If the block below this sign is a class sign, swap the order
-        if (blockBelow.getType() == Material.WALL_SIGN || blockBelow.getType() == Material.SIGN) {
+        if (blockBelow.getType() == Material.OAK_WALL_SIGN || blockBelow.getType() == Material.OAK_SIGN) {
             String className = ChatColor.stripColor(((Sign) blockBelow.getState()).getLine(0)).toLowerCase();
             if (arena.getClasses().containsKey(className)) {
                 blockSign = blockBehind;  // Use blockSign as a temp while swapping
diff --git a/src/main/java/com/garbagemule/MobArena/waves/MACreature.java b/src/main/java/com/garbagemule/MobArena/waves/MACreature.java
index e9afdc6..a373c28 100644
--- a/src/main/java/com/garbagemule/MobArena/waves/MACreature.java
+++ b/src/main/java/com/garbagemule/MobArena/waves/MACreature.java
@@ -45,7 +45,7 @@ public class MACreature
     public static final MACreature WOLF = new MACreature("wolf", "wolves", EntityType.WOLF);
 
     // Special creatures
-    public static final MACreature ZOMBIEPIGMAN = new MACreature("zombiepigman", "zombiepigmen", EntityType.PIG_ZOMBIE);
+    public static final MACreature ZOMBIEPIGMAN = new MACreature("zombiepigman", "zombiepigmen", EntityType.ZOMBIFIED_PIGLIN);
     public static final MACreature POWEREDCREEPER = new MACreature("poweredcreeper", EntityType.CREEPER);
     public static final MACreature ANGRYWOLF = new MACreature("angrywolf", "angrywolves", EntityType.WOLF);
     public static final MACreature ENDERMAN = new MACreature("enderman", "endermen", EntityType.ENDERMAN);
@@ -76,7 +76,7 @@ public class MACreature
     // 1.4 creatures
     public static final MACreature WITCH = new MACreature("witch", "witches", EntityType.WITCH);
     public static final MACreature BABYZOMBIE = new MACreature("babyzombie", EntityType.ZOMBIE);
-    public static final MACreature BABYPIGMAN = new MACreature("babypigman", "babypigmen", EntityType.PIG_ZOMBIE);
+    public static final MACreature BABYPIGMAN = new MACreature("babypigman", "babypigmen", EntityType.ZOMBIFIED_PIGLIN);
     public static final MACreature BABYZOMBIEVILLAGER = new MACreature("babyzombievillager", EntityType.ZOMBIE_VILLAGER);
 
     // 1.6 creatures
@@ -175,11 +175,13 @@ public class MACreature
                 ((Zombie) e).setBaby(true);
                 break;
             case "babypigman":
+            case "babyzombifiedpiglin":
                 ((Zombie) e).setBaby(true);
                 ((PigZombie) e).setAngry(true);
                 break;
             case "pigzombie":
             case "zombiepigman":
+            case "zombifiedpiglin":
                 ((PigZombie) e).setAngry(true);
                 break;
             case "killerbunny":