diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2a587e23..ebb0bd75c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Fixed overlapping durability numbers on the curio HUD (#2484) @glitchplaysgames714
 - Fixed a potential crash involving the refrigerator @Redeix
 - Fixed the evaporation tower requiring an input hatch even for recipes that don't have a fluid input @glitchplaysgames714
+- Fixed loot tables for ore indicator buds @Pyritie
 ### Translation updates
 - Chinese (simplified) @jmecn
 - Ukranian @MetEnBouldry
diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js
index 6938448e4..a913fae05 100644
--- a/kubejs/server_scripts/gregtech/recipes.materials.js
+++ b/kubejs/server_scripts/gregtech/recipes.materials.js
@@ -792,7 +792,7 @@ function registerGTCEUMetalRecipes(event) {
 		let smallDust = ChemicalHelper.get(TagPrefix.dustSmall, material, 1)
 
 		event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless(
-			ChemicalHelper.get(TagPrefix.surfaceRock, material, 1), [gem, '#tfc:chisels']))
+			ChemicalHelper.get(TFGTagPrefix.budIndicator, material, 1), [gem, '#tfc:chisels']))
 			.id(`shapeless/${material.getName()}_bud_indicator`)
 
 		event.shaped(smallDust,
diff --git a/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js b/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js
index c7bc3b175..60fb0ca79 100644
--- a/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js
+++ b/kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js
@@ -23,15 +23,15 @@ const STONE_TYPES_TO_COBBLE = {
 	granite: 'tfc:rock/cobble/granite',
 	deepslate: 'minecraft:cobbled_deepslate',
 	pyroxenite: 'tfg:rock/cobble_blackstone',
-	dripstone: 'tfg:block/rock/cobble_dripstone',
-	keratophyre: 'tfg:block/rock/cobble_crackrack',
+	dripstone: 'tfg:rock/cobble_dripstone',
+	keratophyre: 'tfg:rock/cobble_crackrack',
 	moon_stone: 'ad_astra:moon_cobblestone',
-	moon_deepslate: 'ad_astra:moon_sand',
+	moon_deepslate: 'tfg:rock/cobble_moon_deepslate',
 	mars_stone: 'ad_astra:mars_cobblestone',
 	venus_stone: 'ad_astra:venus_cobblestone',
 	mercury_stone: 'ad_astra:mercury_cobblestone',
 	glacio_stone: 'ad_astra:glacio_cobblestone',
-	permafrost: 'gtceu:ice_dust'
+	permafrost: 'tfg:rock/cobble_permafrost'
 }
 
 const registerTFGOreLoots = (event) => {	
@@ -69,37 +69,22 @@ const registerTFGOreLoots = (event) => {
 
 			// Indicator buds
 			if (material.hasProperty(PropertyKey.GEM)) {
-				let normalDrop = ChemicalHelper.get(TagPrefix.gemChipped, material, 1)
-				let sawDrop = ChemicalHelper.get(TagPrefix.gem, material, 1)
-				let bud = ChemicalHelper.get(TagPrefix.surfaceRock, material, 1)
+				let bud = ChemicalHelper.get(TFGTagPrefix.budIndicator, material, 1).getItem().id;
 
 				event.addBlockLootModifier(bud)
 					.matchMainHand("tfc:gem_saw")
-					.addLoot(sawDrop);
+					.addLoot(ChemicalHelper.get(TagPrefix.gem, material, 1));
 
 				event.addBlockLootModifier(bud)
 					.not(n => n.matchMainHand("tfc:gem_saw"))
-					.addLoot(normalDrop);
+					.addLoot(ChemicalHelper.get(TagPrefix.gemChipped, material, 1));
 			}
 
 			let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1)
 			let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1)
 			let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1)
 
-			// I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS
-			let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`;
-			if (material === GTMaterials.Copper || material === GTMaterials.Gold || material === GTMaterials.Iron) {
-				rawOreBlock = `minecraft${rawOreBlock}`;
-			} else if (material === TFGHelpers.getMaterial('desh')
-				|| material === TFGHelpers.getMaterial('ostrum')
-				|| material === TFGHelpers.getMaterial('calorite')) {
-				rawOreBlock = `ad_astra${rawOreBlock}`;
-			} else if (material === $GreateMaterials.RoseQuartz) {
-				rawOreBlock = `greate${rawOreBlock}`;
-			} else {
-				rawOreBlock = `gtceu${rawOreBlock}`;
-			}
-
+			let rawOreBlock = ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem().id;
 			event.addBlockLootModifier(rawOreBlock)
 				.removeLoot(ItemFilter.ALWAYS_TRUE)
 				.addWeightedLoot([4, 6],
diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js
index 152c7923f..69fb165d4 100644
--- a/kubejs/startup_scripts/gtceu/constants.js
+++ b/kubejs/startup_scripts/gtceu/constants.js
@@ -246,8 +246,7 @@ global.GTCEU_HIDED_ITEMS = /** @type {const} */ ([
 	  "gtceu:iv_damascus_steel_wrench",
 	  "gtceu:lv_damascus_steel_screwdriver",
 
-	  "gtceu:sus_record",
-      "expatternprovider:fishbig"
+	  "gtceu:sus_record"
 ]);
 //#endregion