diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
index 2e1c4f5fee..a8a017dd2a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
@@ -8,3 +8,7 @@
       sprite: Objects/Misc/module.rsi
       state: mainboard
       netsync: false
+    - type: Tag
+      tags:
+      - DroneUsable
+      - FirelockElectronics
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
index c3f8973d94..647c89db02 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
@@ -51,6 +51,7 @@
               anchored: true
           steps:
             - tag: FirelockElectronics
+              store: board
               name: Firelock Electronics
               icon:
                 sprite: "Objects/Misc/module.rsi"
@@ -82,9 +83,7 @@
               doAfter: 0.25
         - to: frame2
           completed:
-            - !type:SpawnPrototype
-              prototype: FirelockElectronics
-              amount: 1
+            - !type:EmptyAllContainers {}
           conditions:
             - !type:EntityAnchored
               anchored: true