diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 2ad69af3162..aba08ecd376 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -245,7 +245,6 @@
     damageProtection:
       flatReductions:
         Heat: 10 # capable of touching light bulbs and stoves without feeling pain!
-  - type: JetpackUser # DeltaV: Lets cyborgs fly in space
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 8508ab7da38..d9f913cc2d4 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -605,7 +605,8 @@
         - PositronicBrain
       borg_module:
         - BorgModuleTool
-        - BorgModuleFireExtinguisher
+        # - BorgModuleFireExtinguisher # Frontier
+        - BorgModuleJetpack # Frontier
         - BorgModuleGPS
   - type: ItemSlots
     slots:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 76010ffc904..c312fedeadc 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -686,6 +686,7 @@
     - BorgModuleHarvesting
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
+    - BorgModuleJetpack # Frontier
     - BorgModuleAdvancedParamedic # Frontier
     - BorgModuleAdvancedMining # Frontier
     - RipleyHarness
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 15846bc02be..629bba514db 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -172,6 +172,7 @@
     - JawsOfLife
     - UtilityBeltChiefEngineer
     - BorgModuleAdvancedTool
+    - BorgModuleJetpack # Frontier
     - NFBlueprintPowerDrill # Frontier
     - NFBlueprintJawsOfLife # Frontier
     - NFBlueprintWelderExperimental # Frontier
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml
index b2363ef9eb0..bbebdd54e66 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -20,6 +20,8 @@
       whitelist:
         components:
         - NFOreBag
+  - type: BorgModuleIcon
+    icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-drill-module }
 
 - type: entity
   id: BorgModuleAdvancedParamedic
@@ -39,3 +41,24 @@
     - Gauze10Lingering
     - Bloodpack10Lingering
     - SyringeBluespace
+  - type: BorgModuleIcon
+    icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-paramed-module }
+
+- type: entity
+  id: BorgModuleJetpack
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: jetpack cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: generic
+    - state: icon-jetpack
+      sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
+  - type: ItemBorgModule
+    droppableItems:
+    - id: JetpackBlueFilled
+      whitelist:
+        components:
+        - Jetpack
+  - type: BorgModuleIcon
+    icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: jetpack-module }
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml
index 50074bbf101..52faad3754a 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml
@@ -19,3 +19,13 @@
     Plastic: 250
     Bluespace: 200 # OreBagOfHolding Bluepsace price
     Diamond: 100 # MiningDrillDiamond Diamond price
+
+- type: latheRecipe
+  id: BorgModuleJetpack
+  result: BorgModuleJetpack
+  parent: BaseBorgModuleRecipe
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50
diff --git a/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-drill-module.png b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-drill-module.png
new file mode 100644
index 00000000000..f49cf07293a
Binary files /dev/null and b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-drill-module.png differ
diff --git a/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-paramed-module.png b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-paramed-module.png
new file mode 100644
index 00000000000..5493b6d3df6
Binary files /dev/null and b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-paramed-module.png differ
diff --git a/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json
new file mode 100644
index 00000000000..d9cd3afdecd
--- /dev/null
+++ b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Made by GhostPrince for Frontier Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "adv-drill-module"
+        },
+        {
+            "name": "adv-paramed-module"
+        },
+        {
+            "name": "jetpack-module"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png
new file mode 100644
index 00000000000..ec7033ec2fe
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index fd70cf73cf1..d5f9e1218e6 100644
--- a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -10,6 +10,9 @@
         {
             "name": "icon-advancedmining"
         },
+        {
+            "name": "icon-jetpack"
+        },
         {
             "name": "icon-paramedic"
         }