diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
index 2fdb8f2f2..509e9e9f6 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
@@ -323,7 +323,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 	// апгрейд на сетку крафта
 	MatteryRecipe(MItems.ExopackUpgrades.CRAFTING_UPGRADE, category = RecipeCategory.TOOLS)
 		.row(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT)
-		.row(MItemTags.WORKBENCHES, MItems.QUANTUM_TRANSCEIVER, MItemTags.WORKBENCHES)
+		.row(MItemTags.CRAFTING_TABLES, MItems.QUANTUM_TRANSCEIVER, MItemTags.CRAFTING_TABLES)
 		.row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)
 		.build(consumer)
 
@@ -447,7 +447,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 	MatteryRecipe(MItems.PAINTER, category = machinesCategory)
 		.row(Items.BRUSH, Items.BUCKET, Items.BUCKET)
 		.row(MItemTags.IRON_PLATES, Items.BUCKET, MItemTags.IRON_PLATES)
-		.row(MItemTags.IRON_PLATES, MItemTags.WORKBENCHES, MItemTags.IRON_PLATES)
+		.row(MItemTags.IRON_PLATES, MItemTags.CRAFTING_TABLES, MItemTags.IRON_PLATES)
 		.unlockedBy(Tags.Items.DYES)
 		.build(consumer)
 }
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
index 9adeb0a23..dd78fad3a 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
@@ -51,8 +51,19 @@ fun addTags(tagsProvider: TagsProvider) {
 		MBlocks.STORAGE_CABLE
 	)
 
+	tagsProvider.items.Appender(MItemTags.CRAFTING_TABLES).add(Items.CRAFTING_TABLE)
 	tagsProvider.items.Appender(MItemTags.WORKBENCHES).add(Items.CRAFTING_TABLE)
+	tagsProvider.items.Appender(MItemTags.WORKBENCH).add(Items.CRAFTING_TABLE)
+	tagsProvider.blocks.Appender(MBlockTags.CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE)
 	tagsProvider.blocks.Appender(MBlockTags.WORKBENCHES).add(Blocks.CRAFTING_TABLE)
+	tagsProvider.blocks.Appender(MBlockTags.WORKBENCH).add(Blocks.CRAFTING_TABLE)
+
+	tagsProvider.items.Appender(MItemTags.CRAFTING_TABLES)
+		.add(MItemTags.WORKBENCHES)
+		.add(MItemTags.WORKBENCH)
+	tagsProvider.blocks.Appender(MBlockTags.CRAFTING_TABLES)
+		.add(MBlockTags.WORKBENCHES)
+		.add(MBlockTags.WORKBENCH)
 
 	tagsProvider.items.Appender(MItemTags.MINECART_CARGO_CRATES).add(MItems.CARGO_CRATE_MINECARTS.values)
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt
index fa873f3e5..86a49364c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt
@@ -27,7 +27,9 @@ object MItemTags {
 	val INDUSTRIAL_GLASS: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass"))
 	val UPGRADES: TagKey<Item> = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "upgrades"))
 
+	val CRAFTING_TABLES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "crafting_tables"))
 	val WORKBENCHES: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "workbenches"))
+	val WORKBENCH: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "workbench"))
 
 	val BASIC_CIRCUIT: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "circuits/basic"))
 	val ADVANCED_CIRCUIT: TagKey<Item> = ItemTags.create(ResourceLocation("forge", "circuits/advanced"))
@@ -85,7 +87,9 @@ object MBlockTags {
 	val CARGO_CRATES: TagKey<Block> = BlockTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "cargo_crates"))
 	val INDUSTRIAL_GLASS: TagKey<Block> = BlockTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass"))
 
+	val CRAFTING_TABLES: TagKey<Block> = BlockTags.create(ResourceLocation("forge", "crafting_tables"))
 	val WORKBENCHES: TagKey<Block> = BlockTags.create(ResourceLocation("forge", "workbenches"))
+	val WORKBENCH: TagKey<Block> = BlockTags.create(ResourceLocation("forge", "workbench"))
 
 	val REQUIRES_TRITANIUM_TOOL: TagKey<Block> = BlockTags.create(ResourceLocation("minecraft", "requires_tritanium_tool"))