diff --git a/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs b/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs
index 4744f342be..6200b669c7 100644
--- a/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs
+++ b/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs
@@ -94,11 +94,11 @@ public sealed class CP14SpawnRandomDemiplaneJob : Job<bool>
         _mapManager.SetMapPaused(_demiplaneMapId, false);
 
         //Spawn modified config
-        _dungeon.GenerateDungeon(indexedLocation,
+        await _dungeon.GenerateDungeonAsync(indexedLocation,
                 grid,
                 grid,
                 Vector2i.Zero,
-                _seed); //Not async, because dont work with biomespawner boilerplate
+                _seed);
 
         //Setup gravity
         var gravity = _entManager.EnsureComponent<GravityComponent>(DemiplaneMapUid);
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml
index 596d92db64..2dc59e68bf 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml
@@ -31,10 +31,14 @@
     # Biome Spawner fills (from border to center!) order is very important! For inexplicable reasons, only a certain sequence works!
     - !type:PrototypeDunGen
       proto: CP14ExpeditionCavesFillBorder
-    - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFillAir
-    - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFillCave
+    - !type:BiomeDunGen
+      biomeTemplate: CP14CavesGeneric
+      tileMask:
+      - CP14FloorSand
+    - !type:BiomeDunGen
+      biomeTemplate: CP14CavesFloor
+      tileMask:
+      - CP14FloorGrass
     - !type:MobsDunGen
       minCount: 2
       maxCount: 2
@@ -96,28 +100,6 @@
         lacunarity: 2
         gain: 0.5
 
-- type: dungeonConfig
-  id: CP14ExpeditionCavesFillAir
-  reserveTiles: true
-  data:
-    entities:
-      Fill: CP14BiomeSpawnerCaveEmpty
-  layers:
-  - !type:FillGridDunGen
-    allowedTiles:
-    - CP14FloorGrass
-
-- type: dungeonConfig
-  id: CP14ExpeditionCavesFillCave
-  reserveTiles: true
-  data:
-    entities:
-      Fill: CP14BiomeSpawnerCave
-  layers:
-  - !type:FillGridDunGen
-    allowedTiles:
-    - CP14FloorSand
-
 - type: dungeonConfig
   id: CP14ExpeditionCavesFillBorder
   reserveTiles: true
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml
index c5df0efbf1..3eef25c616 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml
@@ -34,10 +34,14 @@
     # Biome Spawner fills (from border to center!) order is very important! For inexplicable reasons, only a certain sequence works!
     - !type:PrototypeDunGen
       proto: CP14ExpeditionCavesFillBorder
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrassGeodeFillGrass
-    - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFillCave
+    - !type:BiomeDunGen
+      biomeTemplate: CP14GrasslandTestResult
+      tileMask:
+      - CP14FloorGrass
+    - !type:BiomeDunGen
+      biomeTemplate: CP14CavesGeneric
+      tileMask:
+      - CP14FloorBase
     - !type:PrototypeDunGen
       proto: CP14DemiplaneGrassGeodeFillWater
     - !type:MobsDunGen
@@ -119,17 +123,6 @@
         lacunarity: 2
         gain: 0.5
 
-- type: dungeonConfig
-  id: CP14DemiplaneGrassGeodeFillGrass
-  reserveTiles: true
-  data:
-    entities:
-      Fill: CP14BiomeSpawnerGrassland
-  layers:
-  - !type:FillGridDunGen
-    allowedTiles:
-    - CP14FloorGrass
-
 - type: dungeonConfig
   id: CP14DemiplaneGrassGeodeFillWater
   reserveTiles: true
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml
index d66cc39b44..24ee80acf9 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml
@@ -51,11 +51,6 @@
     - !type:PrototypeDunGen
       proto: CP14ExpeditionGrasslandIslandFloorMaskStone
     # Exterior rooms
-    #- !type:EntityTableDunGen
-    #  minCount: 1
-    #  maxCount: 2
-    #  table:
-    #    id: CP14GrasslandIslandExteriorRoomSpawner
     # Enter and Exit
     - !type:MobsDunGen
       minCount: 1
@@ -64,10 +59,14 @@
       - id: CP14DemiplanEnterRoomMarker
         amount: 1
     # Biome Spawner fills (from border to center!) order is very important! For inexplicable reasons, only a certain sequence works!
-    - !type:PrototypeDunGen
-      proto: CP14ExpeditionGrasslandIslandFillGrassland
-    - !type:PrototypeDunGen
-      proto: CP14ExpeditionGrasslandIslandFillCave
+    - !type:BiomeDunGen
+      biomeTemplate: CP14GrasslandTestResult
+      tileMask:
+      - CP14FloorGrass
+    - !type:BiomeDunGen
+      biomeTemplate: CP14CavesGeneric
+      tileMask:
+      - CP14FloorBase
     - !type:MobsDunGen
       minCount: 2
       maxCount: 2
@@ -127,26 +126,4 @@
         fractalType: FBm
         octaves: 5
         lacunarity: 2
-        gain: 0.5
-
-- type: dungeonConfig
-  id: CP14ExpeditionGrasslandIslandFillGrassland
-  reserveTiles: true
-  data:
-    entities:
-      Fill: CP14BiomeSpawnerGrassland
-  layers:
-  - !type:FillGridDunGen
-    allowedTiles:
-    - CP14FloorGrass
-
-- type: dungeonConfig
-  id: CP14ExpeditionGrasslandIslandFillCave
-  reserveTiles: true
-  data:
-    entities:
-      Fill: CP14BiomeSpawnerCave
-  layers:
-  - !type:FillGridDunGen
-    allowedTiles:
-    - CP14FloorBase
\ No newline at end of file
+        gain: 0.5
\ No newline at end of file