diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
index 01c096f67b2..b7e3eafb5fc 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -7,7 +7,6 @@
     RadioHandheldNF: 15
     ClothingMaskGas: 10
     JetpackMiniFilled: 10
-    JetpackBlue: 10
     HandHeldMassScanner: 10
     AppraisalCartridge: 3
 # Keys
@@ -44,7 +43,6 @@
     RadioHandheldNF: 4294967295 # Infinite
     ClothingMaskGas: 4294967295 # Infinite
     JetpackMiniFilled: 4294967295 # Infinite
-    JetpackBlue: 4294967295 # Infinite
     HandHeldMassScanner: 4294967295 # Infinite
     AppraisalCartridge: 4294967295 # Infinite
 # Keys
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml
index b84cd49c647..d9c0993df37 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml
@@ -11,22 +11,17 @@
     sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi
   - type: Clothing
     sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi
-    slots:
-      - Back
 
 #Filled security
 - type: entity
   id: JetpackNfsdFilled
-  parent: [JetpackNfsd, JetpackSecurityFilled]
+  parent: JetpackSecurityFilled
   name: nfsd jetpack
   suffix: Filled
   components:
-  - type: GasTank
-    outputPressure: 42.6
-    air:
-      # 13 minutes thrust
-      volume: 5
-      temperature: 293.15
-      moles:
-        - 1.025689525 # oxygen
-        - 1.025689525 # nitrogen
\ No newline at end of file
+  - type: Item
+    sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi
+  - type: Sprite
+    sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi
+  - type: Clothing
+    sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..a2985eabfc9
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json
index 32111d1a3cc..7407bd7535b 100644
--- a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json
@@ -54,6 +54,32 @@
           0.2
         ]
       ]
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-SUITSTORAGE",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2
+        ]
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..3846e862a1e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-SUITSTORAGE.png differ