diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
index 444304e..11db913 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
@@ -128,9 +128,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
         registerType("shield_height", 0); // TODO: figure this out
         registerType("shulker_color", DyeColor.RED); // TODO
 
-        // Vindicator
-        registerType("celebrating", false); // TODO
-
         // Wither
         registerType("invulnerable_time", 0); // TODO
 
@@ -438,7 +435,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
 
         // Hoglin and Piglin Zombification
         final int zombificationIndex;
-        if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) zombificationIndex = 17; // Change piglinIndex if you change this
+        if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) zombificationIndex = 17; // Change piglinIndex and pillagerIndex if you change this
         else zombificationIndex = 16;
         register(new BooleanProperty("hoglin_immune_to_zombification", zombificationIndex, false, legacyBooleans));
         register(new BooleanProperty("piglin_immune_to_zombification", zombificationIndex-1, false, legacyBooleans));
@@ -449,6 +446,14 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
         register(new BooleanProperty("piglin_charging_crossbow", piglinIndex++, false, legacyBooleans));
         register(new BooleanProperty("piglin_dancing", piglinIndex, false, legacyBooleans));
 
+        // Pillager
+        int pillagerIndex = zombificationIndex;
+        register(new BooleanProperty("pillager_charging", pillagerIndex, false, legacyBooleans));
+
+        // Vindicator
+        int vindicatorIndex = pillagerIndex-1;
+        register(new BooleanProperty("celebrating", vindicatorIndex, false, legacyBooleans));
+
         if (!ver.isNewerThanOrEquals(ServerVersion.V_1_17)) return;
         // Axolotl
         register(new EncodedIntegerProperty<>("axolotl_variant", AxolotlVariant.LUCY, 17, Enum::ordinal));
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
index 7190d4b..afac796 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
@@ -212,7 +212,8 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
                 .addHandProperties());
 
         register(builder(p, "vindicator", EntityTypes.VINDICATOR)
-                .setHologramOffset(-0.025));
+                .setHologramOffset(-0.025)
+                .addProperties("celebrating"));
 
         register(builder(p, "wither_skeleton", EntityTypes.WITHER_SKELETON)
                 .setHologramOffset(0.425)
@@ -275,7 +276,8 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
 
         register(builder(p, "pillager", EntityTypes.PILLAGER)
                 .setHologramOffset(-0.025)
-                .addHandProperties());
+                .addHandProperties()
+                .addProperties("pillager_charging"));
 
         register(builder(p, "ravager", EntityTypes.RAVAGER)
                 .setHologramOffset(0.225));