diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 2215a6972..a8638f809 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -774,9 +774,8 @@
       "requires": [
         {"canShineCharge": {"usedTiles": 20, "openEnd": 1}},
         "canShinechargeMovementTricky",
-        "canBeVeryPatient",
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canRiskySpikeSuit",
         {"shinespark": {"frames": 12, "excessFrames": 12}}
       ],
       "flashSuitChecked": true,
diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json
index 0335e9513..d1a0dec32 100644
--- a/region/lowernorfair/east/Lower Norfair Fireflea Room.json	
+++ b/region/lowernorfair/east/Lower Norfair Fireflea Room.json	
@@ -1841,8 +1841,7 @@
           "openEnd": 1
         }},
         {"spikeHits": 1},
-        "h_spikeSuitSpikeHitLeniency",
-        "canTrickySpikeSuit",
+        "canRiskySpikeSuit",
         {"shinespark": {"frames": 24, "excessFrames": 8}}
       ],
       "wallJumpAvoid": true,
diff --git a/region/norfair/east/Lava Dive Room.json b/region/norfair/east/Lava Dive Room.json
index bc460d791..d4a488f57 100644
--- a/region/norfair/east/Lava Dive Room.json	
+++ b/region/norfair/east/Lava Dive Room.json	
@@ -420,6 +420,22 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 5],
+      "name": "Gain Flash Suit (SpikeSuit)",
+      "requires": [
+        "h_heatProof",
+        "h_lavaProof",
+        "Gravity",
+        {"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
+        {"spikeHits": 1},
+        "canRiskySpikeSuit",
+        {"shinespark": {"frames": 14}},
+        {"spikeHits": 1}
+      ],
+      "devNote": "FIXME: Add options to retry / without varia etc.",
+      "flashSuitChecked": true
+    },
     {
       "id": 43,
       "link": [1, 5],
diff --git a/tech.json b/tech.json
index d3f0cf69b..888c79e5d 100644
--- a/tech.json
+++ b/tech.json
@@ -2391,6 +2391,18 @@
                     "The ability to gain a flash suit using setups that take longer per attempt,",
                     "involving crossroom shinecharges, long traversals, or room resets to use a farm."
                   ]
+                },
+                {
+                  "name": "canRiskySpikeSuit",
+                  "techRequires": [
+                    "canSpikeSuit"
+                  ],
+                  "otherRequires": [],
+                  "note": [
+                    "The ability to gain a flash suit using a setup that has to be successful on the first try.",
+                    "Failing the spikesuit could require a revert as a second attempt may not be possible",
+                    "Examples include one way crumble blocks or where the intial spark is used to escape."
+                  ]
                 }
               ]
             },