diff --git a/Content.Server/Shuttles/DockingSystem.cs b/Content.Server/Shuttles/DockingSystem.cs
index 952f7a7a7e..0e77d19890 100644
--- a/Content.Server/Shuttles/DockingSystem.cs
+++ b/Content.Server/Shuttles/DockingSystem.cs
@@ -52,19 +52,6 @@ namespace Content.Server.Shuttles
 
             SubscribeLocalEvent<DockingComponent, GetInteractionVerbsEvent>(OnVerb);
             SubscribeLocalEvent<DockingComponent, BeforeDoorAutoCloseEvent>(OnAutoClose);
-            SubscribeLocalEvent<DockingComponent, DoorOpenAttemptEvent>(OnDoorOpenAttempt);
-            SubscribeLocalEvent<DockingComponent, DoorCloseAttemptEvent>(OnDoorCloseAttempt);
-        }
-
-        // Won't allow users to override door controls
-        private void OnDoorOpenAttempt(EntityUid uid, DockingComponent component, DoorOpenAttemptEvent args)
-        {
-            args.Cancel();
-        }
-
-        private void OnDoorCloseAttempt(EntityUid uid, DockingComponent component, DoorCloseAttemptEvent args)
-        {
-            args.Cancel();
         }
 
         private void OnAutoClose(EntityUid uid, DockingComponent component, BeforeDoorAutoCloseEvent args)
diff --git a/Resources/Locale/en-US/shuttles/docking.ftl b/Resources/Locale/en-US/shuttles/docking.ftl
index cda14bbeac..3b8429c3fb 100644
--- a/Resources/Locale/en-US/shuttles/docking.ftl
+++ b/Resources/Locale/en-US/shuttles/docking.ftl
@@ -1,2 +1,2 @@
-docking-component-dock = dock
-docking-component-undock = undock
+docking-component-dock = Dock
+docking-component-undock = Undock
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index d2bf3800f6..c953d0a3f9 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -6984,11 +6984,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 656
-  type: AirlockExternalLocked
+  type: AirlockShuttle
   components:
-  - name: Escape Shuttle Dock
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
+  - rot: -1.5707963267948966 rad
     pos: -41.5,8.5
     parent: 853
     type: Transform
@@ -7037,11 +7035,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 661
-  type: AirlockExternalLocked
+  type: AirlockShuttle
   components:
-  - name: Escape Shuttle Dock
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
+  - rot: -1.5707963267948966 rad
     pos: -41.5,4.5
     parent: 853
     type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 0c959111aa..5ad7b08060 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -2,6 +2,7 @@
   id: AirlockShuttle
   parent: BaseStructure
   name: airlock
+  suffix: Docking
   description: Necessary for connecting two space craft together.
   components:
   - type: Docking