diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/OreGen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/OreGen.kt
index 495aadf91..dfc5c1c4d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/OreGen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/OreGen.kt
@@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.worldgen
 
 import net.minecraft.core.Holder
 import net.minecraft.data.worldgen.features.OreFeatures
+import net.minecraft.tags.BlockTags
 import net.minecraft.world.level.levelgen.VerticalAnchor
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature
 import net.minecraft.world.level.levelgen.feature.Feature
@@ -10,15 +11,19 @@ import net.minecraft.world.level.levelgen.placement.CountPlacement
 import net.minecraft.world.level.levelgen.placement.HeightRangePlacement
 import net.minecraft.world.level.levelgen.placement.InSquarePlacement
 import net.minecraft.world.level.levelgen.placement.PlacedFeature
+import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.core.WriteOnce
 import ru.dbotthepony.mc.otm.registry.register
 
 @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
 object OreGen {
+	private val STONE_ORE_REPLACEABLES = TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES)
+	private val DEEPSLATE_ORE_REPLACEABLES = TagMatchTest(BlockTags.DEEPSLATE_ORE_REPLACEABLES)
+
 	val ORE_TRITANIUM_TARGET_LIST = listOf(
-		OreConfiguration.target(OreFeatures.STONE_ORE_REPLACEABLES, MBlocks.TRITANIUM_ORE.defaultBlockState())!!,
-		OreConfiguration.target(OreFeatures.DEEPSLATE_ORE_REPLACEABLES, MBlocks.DEEPSLATE_TRITANIUM_ORE.defaultBlockState())!!,
+		OreConfiguration.target(STONE_ORE_REPLACEABLES, MBlocks.TRITANIUM_ORE.defaultBlockState())!!,
+		OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, MBlocks.DEEPSLATE_TRITANIUM_ORE.defaultBlockState())!!,
 	)
 
 	var ORE_FEATURE_TRITANIUM_NORMAL by WriteOnce<Holder<ConfiguredFeature<*, *>>>()