diff --git a/bootstrap/fabric/gradle.properties b/bootstrap/fabric/gradle.properties
index 699017989..fbbf18cd3 100644
--- a/bootstrap/fabric/gradle.properties
+++ b/bootstrap/fabric/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.17-rc1
-yarn_mappings=1.17-rc1+build.5
-loader_version=0.11.3
+minecraft_version=1.17.1
+yarn_mappings=1.17.1+build.14
+loader_version=0.11.6
 # Mod Properties
 mod_version=1.4.0-SNAPSHOT
 maven_group=org.geysermc.platform
 archives_base_name=Geyser-Fabric
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.34.9+1.17
+fabric_version=0.37.0+1.17
diff --git a/bootstrap/fabric/src/main/java/org/geysermc/platform/fabric/world/GeyserFabricWorldManager.java b/bootstrap/fabric/src/main/java/org/geysermc/platform/fabric/world/GeyserFabricWorldManager.java
index 63f4b638b..dd0d629c8 100644
--- a/bootstrap/fabric/src/main/java/org/geysermc/platform/fabric/world/GeyserFabricWorldManager.java
+++ b/bootstrap/fabric/src/main/java/org/geysermc/platform/fabric/world/GeyserFabricWorldManager.java
@@ -66,11 +66,10 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
             PlayerEntity player = server.getPlayerManager().getPlayer(session.getPlayerEntity().getUuid());
             if (player != null) {
                 BlockEntity blockEntity = player.world.getBlockEntity(new BlockPos(x, y, z));
-                if (!(blockEntity instanceof LecternBlockEntity)) {
+                if (!(blockEntity instanceof LecternBlockEntity lectern)) {
                     return;
                 }
 
-                LecternBlockEntity lectern = (LecternBlockEntity) blockEntity;
                 if (!lectern.hasBook()) {
                     if (!isChunkLoad) {
                         BlockEntityUtils.updateBlockEntity(session, LecternInventoryTranslator.getBaseLecternTag(x, y, z, 0).build(), Vector3i.from(x, y, z));
@@ -88,8 +87,8 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
                         .putShort("Damage", (short) 0)
                         .putString("Name", "minecraft:writable_book");
                 List<NbtMap> pages = new ArrayList<>(hasBookPages ? pageCount : 1);
-                if (hasBookPages && WritableBookItem.isValid(book.getTag())) {
-                    NbtList listTag = book.getTag().getList("pages", 8);
+                if (hasBookPages && WritableBookItem.isValid(book.getNbt())) {
+                    NbtList listTag = book.getNbt().getList("pages", 8);
 
                     for (int i = 0; i < listTag.size(); i++) {
                         String page = listTag.getString(i);
diff --git a/bootstrap/fabric/src/main/resources/assets/geyser-fabric/icon.png b/bootstrap/fabric/src/main/resources/assets/geyser-fabric/icon.png
new file mode 100644
index 000000000..4e6a38a78
Binary files /dev/null and b/bootstrap/fabric/src/main/resources/assets/geyser-fabric/icon.png differ
diff --git a/bootstrap/fabric/src/main/resources/fabric.mod.json b/bootstrap/fabric/src/main/resources/fabric.mod.json
index eaec51a21..baa4888a5 100644
--- a/bootstrap/fabric/src/main/resources/fabric.mod.json
+++ b/bootstrap/fabric/src/main/resources/fabric.mod.json
@@ -25,6 +25,6 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": "*",
-    "minecraft": "1.17.x"
+    "minecraft": ">=1.17.1"
   }
 }