diff --git a/build.gradle b/build.gradle
index 8940ca6..34f56a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,9 +85,11 @@ publishing {
     }
     repositories {
         maven {
-            credentials {
-                username DIST_USERNAME
-                password DIST_PASSWORD
+            if (DIST_USERNAME != null && DIST_PASSWORD != null) {
+                credentials {
+                    username DIST_USERNAME
+                    password DIST_PASSWORD
+                }
             }
             url = uri("https://repo.pyr.lol/releases/")
         }
diff --git a/src/main/java/io/github/znetworkw/znpcservers/npc/NPC.java b/src/main/java/io/github/znetworkw/znpcservers/npc/NPC.java
index 076a28b..0587a1c 100644
--- a/src/main/java/io/github/znetworkw/znpcservers/npc/NPC.java
+++ b/src/main/java/io/github/znetworkw/znpcservers/npc/NPC.java
@@ -238,7 +238,7 @@ public class NPC {
                     PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerSpawnPlayer(entityID,
                             this.gameProfile.getId(), SpigotConversionUtil.fromBukkitLocation(location.toBukkitLocation())));
                     PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerEntityMetadata(entityID,
-                            List.of(new EntityData(17, EntityDataTypes.BYTE, Byte.MAX_VALUE)))); // 17 only works on ~1.19, this will need to be fixed in the entity rewrite
+                            List.of(new EntityData(NPCSkin.SkinLayerValues.findLayerByVersion(), EntityDataTypes.BYTE, Byte.MAX_VALUE))));
                     PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerEntityHeadLook(entityID, location.getYaw()));
                 });
             }