diff --git a/Resources/Maps/Shuttles/anchor.yml b/Resources/Maps/Shuttles/anchor.yml
index a0e8baf7e93..fd32d7323db 100644
--- a/Resources/Maps/Shuttles/anchor.yml
+++ b/Resources/Maps/Shuttles/anchor.yml
@@ -7526,7 +7526,7 @@ entities:
     - pos: 5.4605694,-3.509058
       parent: 1
       type: Transform
-- proto: hydroponicsTray
+- proto: hydroponicsTrayAnchored
   entities:
   - uid: 1078
     components:
diff --git a/Resources/Maps/Shuttles/empress.yml b/Resources/Maps/Shuttles/empress.yml
index 4a7a522ccd3..09d835c1b37 100644
--- a/Resources/Maps/Shuttles/empress.yml
+++ b/Resources/Maps/Shuttles/empress.yml
@@ -6594,7 +6594,7 @@ entities:
           occludes: True
           ent: null
       type: ContainerContainer
-- proto: Gyroscope
+- proto: GyroscopeSecurity
   entities:
   - uid: 86
     components:
@@ -6790,7 +6790,7 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: hydroponicsTray
+- proto: hydroponicsTrayAnchored
   entities:
   - uid: 533
     components:
diff --git a/Resources/Maps/Shuttles/marauder.yml b/Resources/Maps/Shuttles/marauder.yml
index 66b1eb737d6..dcc2bc895dc 100644
--- a/Resources/Maps/Shuttles/marauder.yml
+++ b/Resources/Maps/Shuttles/marauder.yml
@@ -6281,7 +6281,7 @@ entities:
           occludes: True
           ent: null
       type: ContainerContainer
-- proto: Gyroscope
+- proto: GyroscopeSecurity
   entities:
   - uid: 902
     components:
@@ -8573,7 +8573,7 @@ entities:
       pos: 3.5,15.5
       parent: 1
       type: Transform
-- proto: Thruster
+- proto: ThrusterSecurity
   entities:
   - uid: 1197
     components:
diff --git a/Resources/Maps/Shuttles/skipper.yml b/Resources/Maps/Shuttles/skipper.yml
index c255df30699..bd437576662 100644
--- a/Resources/Maps/Shuttles/skipper.yml
+++ b/Resources/Maps/Shuttles/skipper.yml
@@ -1812,7 +1812,7 @@ entities:
     - pos: -1.3298461,3.5920248
       parent: 1
       type: Transform
-- proto: hydroponicsTray
+- proto: hydroponicsTrayAnchored
   entities:
   - uid: 226
     components:
diff --git a/Resources/Maps/tinnia.yml b/Resources/Maps/tinnia.yml
index 9908536c30d..ffb4108e946 100644
--- a/Resources/Maps/tinnia.yml
+++ b/Resources/Maps/tinnia.yml
@@ -10243,7 +10243,7 @@ entities:
     - pos: -5.967525,12.464038
       parent: 1
       type: Transform
-- proto: hydroponicsTray
+- proto: hydroponicsTrayAnchored
   entities:
   - uid: 257
     components: