diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 89240bf009..56d0ca606f 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -404,6 +404,9 @@
 	},
 /obj/effect/turf_decal/box,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/pod/dark,
 /area/shuttle/pirate)
 "aR" = (
@@ -641,6 +644,9 @@
 	},
 /obj/effect/turf_decal/box,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/pod/dark,
 /area/shuttle/pirate)
 "bf" = (
@@ -999,9 +1005,6 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/pirate)
 "bN" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
 	dir = 4;
 	req_access = "150";
@@ -1013,9 +1016,6 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/pirate)
 "bO" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
 /obj/machinery/computer/monitor/secret{
 	dir = 8
 	},
@@ -1480,6 +1480,7 @@
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/crate/large,
 /obj/machinery/jukebox{
+	anchored = 0;
 	desc = "Formally known as the SSDD, the Space Shanty Delivery Device is employed by various rings of the piracy scene for its capability of raising crew morale with its inspiring tunes. Unfortunately, this one doesn't seem as if it has many records pertaining to its designated topic on hand.";
 	name = "\improper Space Shanty Delivery Device";
 	req_one_access = null
@@ -1824,7 +1825,7 @@
 	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
 	name = "Pirate Ship";
 	port_direction = 2;
-	width = 17
+	width = 23
 	},
 /obj/docking_port/stationary{
 	dwidth = 11;
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index b873f25316..d284146ea3 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -215,8 +215,8 @@
 	shuttleId = "pirateship"
 	lock_override = CAMERA_LOCK_STATION
 	shuttlePortId = "pirateship_custom"
-	x_offset = 7
-	y_offset = 0
+	x_offset = 11
+	y_offset = 1
 	see_hidden = FALSE
 
 /obj/docking_port/mobile/pirate