diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 358e3c6043e2..88f9d19d8405 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -11,8 +11,8 @@
         Manipulator: 1
       materialRequirements:
         Glass: 1
-    - type: StaticPrice
-      price: 200
+    - type: VendPrice # Frontier
+      price: 2000
 
 - type: entity
   id: ProtolatheMachineCircuitboard
@@ -30,8 +30,8 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 500
+    - type: VendPrice # Frontier
+      price: 5000
 
 - type: entity
   id: SecurityTechFabCircuitboard
@@ -84,8 +84,8 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 500
+    - type: VendPrice # Frontier
+      price: 5000
 
 - type: entity
   id: CircuitImprinterMachineCircuitboard
@@ -104,8 +104,8 @@
         Amount: 2
         DefaultPrototype: Beaker
         ExamineName: Glass Beaker
-  - type: StaticPrice
-    price: 500
+  - type: VendPrice # Frontier
+    price: 5000
 
 - type: entity
   id: ExosuitFabricatorMachineCircuitboard
@@ -124,8 +124,8 @@
   - type: GuideHelp
     guides:
     - Robotics
-  - type: StaticPrice
-    price: 400
+  - type: VendPrice # Frontier
+    price: 4000
 
 # yes i know this prototype name is long i'm just following conventions
 - type: entity
@@ -140,8 +140,8 @@
     prototype: ResearchAndDevelopmentServer
     materialRequirements:
       Plasma: 5
-  - type: StaticPrice
-    price: 250
+  - type: VendPrice # Frontier
+    price: 2500
 
 - type: entity
   id: UniformPrinterMachineCircuitboard
@@ -153,8 +153,8 @@
     requirements:
       MatterBin: 1
       Manipulator: 2
-  - type: StaticPrice
-    price: 100
+  - type: VendPrice # Frontier
+    price: 1000
 
 - type: entity
   id: VaccinatorMachineCircuitboard
@@ -459,8 +459,8 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 150
+    - type: VendPrice # Frontier
+      price: 1500
 
 - type: entity
   id: SeedExtractorMachineCircuitboard
@@ -617,7 +617,7 @@
           Amount: 1
           DefaultPrototype: SaxophoneInstrument
           ExamineName: Woodwind Instrument
-    - type: StaticPrice
+    - type: VendPrice # Frontier
       price: 400
 
 
@@ -784,8 +784,8 @@
       materialRequirements:
         Steel: 5
         Plastic: 5
-    - type: StaticPrice
-      price: 200
+    - type: VendPrice
+      price: 2000
 
 - type: entity
   id: OreProcessorMachineCircuitboard
@@ -801,8 +801,8 @@
         Manipulator: 3
       materialRequirements:
         Glass: 1
-    - type: StaticPrice
-      price: 200
+    - type: VendPrice
+      price: 2000
 
 - type: entity
   id: SheetifierMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 32640e25d1e8..7092efd7fb72 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -82,8 +82,8 @@
       state: cpu_supply
     - type: ComputerBoard
       prototype: ComputerCargoOrders
-    - type: StaticPrice
-      price: 750
+#    - type: StaticPrice # Frontier
+#      price: 750
     - type: Tag
       tags:
       - DroneUsable
@@ -188,8 +188,8 @@
       state: cpu_science
     - type: ComputerBoard
       prototype: ComputerResearchAndDevelopment
-    - type: StaticPrice
-      price: 250
+    - type: VendPrice # Frontier
+      price: 2500
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -232,8 +232,8 @@
       state: cpu_command
     - type: ComputerBoard
       prototype: ComputerId
-    - type: StaticPrice
-      price: 750
+#    - type: StaticPrice # Frontier
+#      price: 750
     - type: Tag
       tags:
       - DroneUsable
@@ -357,8 +357,8 @@
       state: cpu_command
     - type: ComputerBoard
       prototype: ComputerIFF
-    - type: StaticPrice
-      price: 750
+    - type: VendPrice # Frontier
+      price: 7500
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -369,19 +369,6 @@
     - type: ComputerBoard
       prototype: ComputerIFFSyndicate
 
-- type: entity
-  parent: BaseComputerCircuitboard
-  id: ShipyardComputerCircuitboard
-  name: shipyard computer board
-  description: A computer printed circuit board for a shipyard computer.
-  components:
-    - type: Sprite
-      state: cpu_supply
-    - type: ComputerBoard
-      prototype: ComputerShipyard
-    - type: StaticPrice
-      price: 750
-
 - type: entity
   parent: BaseComputerCircuitboard
   id: ComputerMassMediaCircuitboard
@@ -390,8 +377,8 @@
   components:
     - type: Sprite
       state: cpu_service
-    - type: StaticPrice
-      price: 150
+#    - type: StaticPrice # Frontier
+#      price: 150
     - type: ComputerBoard
       prototype: ComputerMassMedia
 
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml
new file mode 100644
index 000000000000..c4016b673035
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: ShipyardComputerCircuitboard
+  name: shipyard computer board
+  description: A computer printed circuit board for a shipyard computer.
+  components:
+    - type: Sprite
+      state: cpu_supply
+    - type: ComputerBoard
+      prototype: ComputerShipyard
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
index 7dd6c00ae6d6..e23b1465d92a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -12,5 +12,3 @@
         MatterBin: 1
       materialRequirements:
         Glass: 1
-    - type: StaticPrice
-      price: 100