diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index e7c958a52..21c361d6d 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -5669,6 +5669,9 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/b
 6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json
 391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json
 d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json
+58a0fbab3425558d993559e10fe14a1797b05eab data/forge/tags/items/armors/boots.json
+7973972edb524683ef365bc103fcfcde0858a854 data/forge/tags/items/armors/chestplates.json
+615e86e25fc29ead90e0901cdaee9d0ed9b3e4b3 data/forge/tags/items/armors/helmets.json
 5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json
 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json
 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json
diff --git a/src/generated/resources/data/forge/tags/items/armors/boots.json b/src/generated/resources/data/forge/tags/items/armors/boots.json
new file mode 100644
index 000000000..d97b2e831
--- /dev/null
+++ b/src/generated/resources/data/forge/tags/items/armors/boots.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "create:diving_boots"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/items/armors/chestplates.json b/src/generated/resources/data/forge/tags/items/armors/chestplates.json
new file mode 100644
index 000000000..9c5cb97a4
--- /dev/null
+++ b/src/generated/resources/data/forge/tags/items/armors/chestplates.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "create:copper_backtank"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/items/armors/helmets.json b/src/generated/resources/data/forge/tags/items/armors/helmets.json
new file mode 100644
index 000000000..d5208adbf
--- /dev/null
+++ b/src/generated/resources/data/forge/tags/items/armors/helmets.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "create:diving_helmet"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java
index 63b6e3b3a..ce17aa4fb 100644
--- a/src/main/java/com/simibubi/create/AllItems.java
+++ b/src/main/java/com/simibubi/create/AllItems.java
@@ -69,6 +69,7 @@ import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Rarity;
 import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.data.ForgeItemTagsProvider;
 
 public class AllItems {
 
@@ -251,12 +252,15 @@ public class AllItems {
 	COPPER_BACKTANK = REGISTRATE.item("copper_backtank", p -> new CopperBacktankItem(p, COPPER_BACKTANK_PLACEABLE))
 		.model(AssetLookup.customGenericItemModel("_", "item"))
 		.tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag)
+			.tag(forgeItemTag("armors/chestplates"))
 		.register(),
 
 		DIVING_HELMET = REGISTRATE.item("diving_helmet", DivingHelmetItem::new)
+				.tag(forgeItemTag("armors/helmets"))
 			.register(),
 
 		DIVING_BOOTS = REGISTRATE.item("diving_boots", DivingBootsItem::new)
+				.tag(forgeItemTag("armors/boots"))
 			.register();
 
 	public static final ItemEntry<SandPaperItem> SAND_PAPER = REGISTRATE.item("sand_paper", SandPaperItem::new)