diff --git a/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java b/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
index def43b7e3c..8b6610d7f1 100644
--- a/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
+++ b/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
@@ -1,9 +1,10 @@
 package com.simibubi.create.api.contraption.storage.item;
 
+import com.mojang.serialization.MapCodec;
+
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
 import com.simibubi.create.api.registry.CreateBuiltInRegistries;
 import com.simibubi.create.api.registry.CreateRegistries;
 import com.simibubi.create.api.registry.SimpleRegistry;
@@ -30,7 +31,7 @@ public abstract class MountedItemStorageType<T extends MountedItemStorage> {
 	});
 
 	public final MapCodec<? extends T> codec;
-	public final Holder<MountedItemStorageType<?>> holder = CreateBuiltInRegistries.MOUNTED_ITEM_STORAGE_TYPE.createIntrusiveHolder(this);
+	public final Holder.Reference<MountedItemStorageType<?>> holder = CreateBuiltInRegistries.MOUNTED_ITEM_STORAGE_TYPE.createIntrusiveHolder(this);
 
 	protected MountedItemStorageType(MapCodec<? extends T> codec) {
 		this.codec = codec;
diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java
index 7b7ff72b8c..93e3505f17 100644
--- a/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java
+++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java
@@ -12,23 +12,22 @@ import com.simibubi.create.api.registry.CreateRegistries;
 
 import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.PackOutput;
-import net.minecraft.data.tags.TagsProvider;
-import net.minecraft.tags.TagEntry;
+import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
 
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 
-public class CreateMountedItemStorageTypeTagsProvider extends TagsProvider<MountedItemStorageType<?>> {
+public class CreateMountedItemStorageTypeTagsProvider extends IntrinsicHolderTagsProvider<MountedItemStorageType<?>> {
 	public CreateMountedItemStorageTypeTagsProvider(PackOutput output, CompletableFuture<Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
-		super(output, CreateRegistries.MOUNTED_ITEM_STORAGE_TYPE, lookupProvider, Create.ID, existingFileHelper);
+		super(output, CreateRegistries.MOUNTED_ITEM_STORAGE_TYPE, lookupProvider, type -> type.holder.key(), Create.ID, existingFileHelper);
 	}
 
 	@Override
 	protected void addTags(Provider pProvider) {
 		tag(AllMountedItemStorageTypeTags.INTERNAL.tag).add(
-			TagEntry.element(AllMountedStorageTypes.DISPENSER.getId())
+			AllMountedStorageTypes.DISPENSER.get()
 		);
 		tag(AllMountedItemStorageTypeTags.FUEL_BLACKLIST.tag).add(
-			TagEntry.element(AllMountedStorageTypes.VAULT.getId())
+			AllMountedStorageTypes.VAULT.get()
 		);
 
 		// VALIDATE