diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
index 1cf0135d7a..5412469ac5 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
@@ -51,7 +51,7 @@ public sealed class ComputerConstruction : InteractionTest
             Screw,
             Pry,
             Wrench,
-            Weld);
+            Screw);
 
         // construction finished, entity no longer exists.
         AssertDeleted();
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
index 688979b7a5..02e141826c 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
@@ -13,7 +13,7 @@
           steps:
             - material: Steel
               amount: 15
-              doAfter: 10
+              doAfter: 2
     - node: MeatSpike
       entity: KitchenSpike
       edges:
@@ -22,9 +22,6 @@
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 15
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           steps:
-            - tool: Welding
-              doAfter: 10
+            - tool: Screwing
+              doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml
index 428757e5b9..214bde3fad 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml
@@ -22,9 +22,6 @@
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 2
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           steps:
             - tool: Screwing
               doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
index 6bbbd4f2ff..4792bb216f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
@@ -11,6 +11,7 @@
           steps:
             - material: Steel
               amount: 5
+              doAfter: 2.5
 
     - node: frameUnsecured
       actions:
@@ -29,16 +30,13 @@
                 state: "id_mod"
 
         - to: start
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           completed:
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 5
             - !type:DeleteEntity {}
           steps:
-            - tool: Welding
+            - tool: Screwing
               doAfter: 2
 
     - node: boardUnsecured
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
index cfbcaf6767..01d8b44322 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
@@ -33,9 +33,6 @@
           steps:
             - material: Cable
         - to: start
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           completed:
             - !type:SpawnPrototype
               prototype: SheetSteel1