diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5081a4e74..77edbaaec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ Added TFC Gurman, which adds even more food and drink
 - Reduced the cost of the ME Ingredient Buffer @Pyritie
 - Renamed Blubber to Animal Fat and added it to the drop tables of more animals (pigs drop a fair bit, orcas drop a ton). Renamed Fish Oil to Tallowate since you can turn animal fat into tallow into fish oil (now tallowate). From there you can turn it into biodiesel! @Pyritie
 - Removed black/red/blue arc furnace dust to ingot recipes, but changed the EBF recipes to MV (#2306) @applenper @Pyritie
+- Glass bottles and ceramic jugs can now hold the same fluids as wooden barrels, buckets, etc @Pyritie
+- Added fluid/item capacity tooltips to many fluid/item containers @Pyritie
 ### Bug fixes
 - Fixed brown gravy recipe @Redeix
 - Fixed instant mac recipe requiring less cardboard than it gives back @Redeix
diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
index 7ea2a2440..b6df3fc36 100644
--- a/kubejs/client_scripts/tooltips.js
+++ b/kubejs/client_scripts/tooltips.js
@@ -221,11 +221,58 @@ const registerTooltips = (event) => {
 		text.add(1, Text.translate("greate.tooltip.max_capacity").append(Text.translate("tfg.greate.ls_limit")))
 	})
 
+	// Fluid + item containers
 	global.LAB_EQUIPMENT_CONTAINERS.forEach(container => {
 		event.addAdvanced([`tfg:${container.type}`], (item, advanced, text) => {
-			text.add(1, Text.translate('tfg.tooltip.lab_equipment.part').append(`§e${container.capacity.toString()}mB`))
+			text.add(1, Text.translate('gtceu.universal.tooltip.fluid_storage_capacity', `${container.capacity}`))
 		})
 	})
+	event.addAdvanced(['#firmalife:big_barrels'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "36"))
+		text.add(2, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "80,000"))
+	})
+	event.addAdvanced(['create:fluid_tank', 'create_connected:fluid_vessel'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "16,000"))
+	})
+	event.addAdvanced(['#tfc:barrels'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "10,000"))
+	})
+	event.addAdvanced(['tfc:crucible'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "4,032"))
+	})
+	event.addAdvanced(['waterflasks:red_steel_flask'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "2,000"))
+	})
+	event.addAdvanced(['waterflasks:iron_flask', 'tfc:wooden_bucket', 'firmalife:mixing_bowl'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "1,000"))
+	})
+	event.addAdvanced(['waterflasks:leather_flask'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "500"))
+	})
+	event.addAdvanced(['tfc:hematitic_glass_bottle', 'tfc:silica_glass_bottle', 'tfc:volcanic_glass_bottle', 'tfc:olivine_glass_bottle'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "400"))
+	})
+	event.addAdvanced(['#tfc:lamps'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "250"))
+	})
+	event.addAdvanced(['tfc:ceramic/jug', 'firmalife:hollow_shell'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.fluid_storage_capacity", "100"))
+	})
+	event.addAdvanced(['#tfcastikorcarts:supply_cart'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "54"))
+	})
+	event.addAdvanced(['framedblocks:framed_chest'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "27"))
+	})
+	event.addAdvanced(['create:item_vault', 'create_connected:item_silo'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "20"))
+	})
+	event.addAdvanced(['#forge:chests/wooden'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "18"))
+	})
+	event.addAdvanced(['#tfc:fired_large_vessels'], (item, advanced, text) => {
+		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "9"))
+	})
 
 	//Nuclear Fission Tooltips
 
diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js
index 49c301811..63c386ca5 100644
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@@ -703,6 +703,8 @@ function registerTFCFluidTags(event) {
     // Can use only neutral fluids.
     event.add('tfc:usable_in_barrel', '#forge:neutral_fluids');
     event.add('tfc:usable_in_wooden_bucket', '#forge:neutral_fluids');
+    // Ceramic jugs and glass bottles
+    event.add('tfc:usable_in_jug', '#forge:neutral_fluids');
     event.add('firmalife:usable_in_mixing_bowl', '#forge:neutral_fluids');
 
 	// All fluids are given the '#tfg:not_solid' tag incase we have a use for them regardless of state.