diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
index 1d8505533f2..01d7a0668a9 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
@@ -19,12 +19,12 @@
           radius: 0.2
         density: 190
         mask:
-        - MachineMask
-        layer:
-        - Opaque
-        - MidImpassable
-        - HighImpassable
-        - BulletImpassable
+        - TableMask # Frontier - MachineMask<TableMask
+        # layer:
+        # - Opaque
+        # - MidImpassable
+        # - HighImpassable
+        # - BulletImpassable
   - type: InteractionOutline
 # Frontier
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
index f3e9c826d3b..926f731113f 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
@@ -17,9 +17,9 @@
           bounds: "-0.45,-0.45,0.45,0.45"
         density: 60
         mask:
-        - MachineMask
+        - TableMask # Frontier - Stop AI Abuse - MachineMask<TableMask
         layer:
-        - GlassAirlockLayer
+        - TableLayer # Frontier - Stop AI Abuse - GlassAirlockLayer<TableLayer
   - type: InteractionOutline
   - type: Construction
     graph: Girder
@@ -54,6 +54,7 @@
           collection: MetalBreak
   - type: StaticPrice
     price: 10
+  - type: Climbable # Frontier - Stop AI Abuse
 
 - type: entity
   id: ReinforcedGirder