diff --git a/assets/common/manifests/ship_manifest.ron b/assets/common/manifests/ship_manifest.ron
index 280e942578..3824fbd50d 100644
--- a/assets/common/manifests/ship_manifest.ron
+++ b/assets/common/manifests/ship_manifest.ron
@@ -70,6 +70,24 @@
             offset: (-1.5, -6.0, -5.0),
             central: ("empty"),
         ),
+
+        custom_indices: {
+            1: Air(ChairSingle, 4),
+            2: Air(Helm, 0),
+            3: Air(Door, 6),
+            4: Air(Door, 2),
+            9: Air(CraftingBench, 0),
+            10: Air(Window1, 0),
+            11: Air(RepairBench, 0),
+            12: Air(DismantlingBench, 4),
+            13: Air(Window1, 2),
+            14: Air(Crate, 0),
+            15: Air(Anvil, 2),
+            16: Air(Tent, 0),
+            17: Air(CookingPot, 0),
+            18: Air(WallLamp, 4),
+            19: Air(Lantern, 4),
+        },
     ),
     Galleon: (
         bone0: (
@@ -90,7 +108,21 @@
         ),
 
         custom_indices: {
-            1: Air(Helm, 0),
+            1: Air(ChairSingle, 4),
+            2: Air(Helm, 0),
+            3: Air(DoorWide, 4),
+            4: Air(DoorWide, 0),
+            9: Air(CraftingBench, 0),
+            10: Air(Window1, 0),
+            11: Air(RepairBench, 0),
+            12: Air(DismantlingBench, 4),
+            13: Air(Window1, 2),
+            14: Air(Crate, 0),
+            15: Air(Cauldron, 2),
+            16: Air(Tent, 0),
+            17: Air(CookingPot, 0),
+            18: Air(WallLamp, 4),
+            19: Air(Lantern, 4),
         },
     ),
 })
diff --git a/assets/common/voxel/galleon/structure.vox b/assets/common/voxel/galleon/structure.vox
index 5b2e466d25..b3794de2da 100644
--- a/assets/common/voxel/galleon/structure.vox
+++ b/assets/common/voxel/galleon/structure.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4070cbfc78efc2e86520d0dcee5b0107a6c08e86914870503c6645575726a52
-size 37357
+oid sha256:dd2d8fcda0a2385aeb1f90fb5f133a1d1c5431fa8a31c7e85756447c9bf33ad2
+size 16068
diff --git a/assets/common/voxel/sail_boat/structure.vox b/assets/common/voxel/sail_boat/structure.vox
index 023d62b9c6..895c001dec 100644
--- a/assets/common/voxel/sail_boat/structure.vox
+++ b/assets/common/voxel/sail_boat/structure.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17cef56b0257883c2b7ea898a04860706d2c6ec7b18f5c1e9c965164af05ae7c
-size 5524
+oid sha256:c73be6d40e40bdf6437282fefd1ec14ade45a8d654209cb298a21c7c2e0aa759
+size 5724
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 6f56b3b970..3d550dda29 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -1685,7 +1685,7 @@ fn handle_spawn_ship(
 ) -> CmdResult<()> {
     let angle = parse_cmd_args!(args, f32);
     let mut pos = position(server, target, "target")?;
-    pos.0.z += 50.0;
+    pos.0.z += 2.0;
     const DESTINATION_RADIUS: f32 = 2000.0;
     let angle = angle.map(|a| a * std::f32::consts::PI / 180.0);
     let dir = angle.map(|a| Vec3::new(a.cos(), a.sin(), 0.0));