diff --git a/build.gradle.kts b/build.gradle.kts
index 7729919e..1f869569 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "nl.matsv"
-    version = "3.3.0-21w11a"
+    version = "3.3.0-21w13a"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index efbe75a8..4ccb5ffc 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     // ViaVersion
-    const val viaversion = "3.3.0-21w11a"
+    const val viaversion = "3.3.0-21w13a"
 
     // Common
     const val netty = "4.0.20.Final"
diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index b9933fd6..f78f6317 100644
--- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -181,6 +181,7 @@ public class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17> {
         registerMetaHandler().filter(Entity1_17Types.GLOW_SQUID, 16).removed();
 
         mapEntity(Entity1_17Types.AXOLOTL, Entity1_17Types.TROPICAL_FISH).jsonName("Axolotl");
+        mapEntity(Entity1_17Types.GOAT, Entity1_17Types.SHEEP).jsonName("Goat");
 
         mapEntity(Entity1_17Types.GLOW_SQUID, Entity1_17Types.SQUID).jsonName("Glow Squid");
         mapEntity(Entity1_17Types.GLOW_ITEM_FRAME, Entity1_17Types.ITEM_FRAME);
diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
index 4cd63b66..46bd5a01 100644
--- a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
+++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
@@ -724,7 +724,8 @@
     "minecraft:deepslate_coal_ore": "minecraft:coal_ore",
     "minecraft:deepslate_emerald_ore": "minecraft:emerald_ore",
     "minecraft:deepslate_copper_ore": "minecraft:iron_ore",
-    "minecraft:infested_deepslate": "minecraft:coal_ore"
+    "minecraft:infested_deepslate": "minecraft:coal_ore",
+    "minecraft:light": "minecraft:air"
   },
   "items": {
     "minecraft:dirt_path": {
@@ -1178,6 +1179,14 @@
     "minecraft:deepslate_emerald_ore": {
       "id": "minecraft:emerald_ore",
       "name": "1.17 Deepslate Emerald Ore"
+    },
+    "minecraft:light": {
+      "id": "minecraft:barrier",
+      "name": "1.17 Light"
+    },
+    "minecraft:goat_spawn_egg": {
+      "id": "minecraft:silverfish_spawn_egg",
+      "name": "1.17 Goat Spawn Egg"
     }
   },
   "sounds": {
@@ -1360,7 +1369,18 @@
     "entity.glow_item_frame.rotate_item": "",
     "item.axe.scrape": "",
     "item.axe.wax_off": "",
-    "item.honeycomb.wax_on": ""
+    "item.honeycomb.wax_on": "",
+    "entity.goat.ambient": "",
+    "entity.goat.death": "",
+    "entity.goat.hurt": "",
+    "entity.goat.milk": "",
+    "entity.goat.prepare_ram": "",
+    "entity.goat.screaming.ambient": "",
+    "entity.goat.screaming.death": "",
+    "entity.goat.screaming.hurt": "",
+    "entity.goat.screaming.milk": "",
+    "entity.goat.screaming.ram": "",
+    "entity.goat.step": ""
   },
   "particles": {
     "small_flame": "flame",
@@ -1378,6 +1398,7 @@
     "wax_on": "happy_villager",
     "wax_off": "happy_villager",
     "electric_spark": "happy_villager",
-    "scrape": "happy_villager"
+    "scrape": "happy_villager",
+    "light": "barrier"
   }
 }
\ No newline at end of file