diff --git a/src/main/java/com/ldtteam/structurize/event/LifecycleSubscriber.java b/src/main/java/com/ldtteam/structurize/event/LifecycleSubscriber.java
index 1d4679d15..5b0793421 100644
--- a/src/main/java/com/ldtteam/structurize/event/LifecycleSubscriber.java
+++ b/src/main/java/com/ldtteam/structurize/event/LifecycleSubscriber.java
@@ -6,28 +6,18 @@
 import com.ldtteam.structurize.datagen.BlockTagProvider;
 import com.ldtteam.structurize.datagen.EntityTagProvider;
 import com.ldtteam.structurize.network.messages.*;
-import com.ldtteam.structurize.placement.handlers.placement.PlacementHandlers;
 import com.ldtteam.structurize.storage.ServerStructurePackLoader;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.world.level.block.Block;
-import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
-import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Set;
-
 public class LifecycleSubscriber
 {
     @SubscribeEvent
@@ -88,18 +78,4 @@ public static void onDatagen(@NotNull final GatherDataEvent event)
         generator.addProvider(event.includeServer(), new BlockTagProvider(event.getGenerator().getPackOutput(), Registries.BLOCK, event.getLookupProvider(), event.getExistingFileHelper()));
         generator.addProvider(event.includeClient(), new EntityTagProvider(event.getGenerator().getPackOutput(), Registries.ENTITY_TYPE, event.getLookupProvider(), event.getExistingFileHelper()));
     }
-
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public static void registerCaps(final RegisterCapabilitiesEvent event)
-    {
-        final Set<Block> containerBlocks = Collections.newSetFromMap(new IdentityHashMap<>());
-        for (final Block block : BuiltInRegistries.BLOCK)
-        {
-            if (event.isBlockRegistered(Capabilities.ItemHandler.BLOCK, block))
-            {
-                containerBlocks.add(block);
-            }
-        }
-        PlacementHandlers.ContainerPlacementHandler.CONTAINERS = containerBlocks;
-    }
 }
diff --git a/src/main/java/com/ldtteam/structurize/placement/handlers/placement/PlacementHandlers.java b/src/main/java/com/ldtteam/structurize/placement/handlers/placement/PlacementHandlers.java
index 0aba69fe2..e4a306436 100644
--- a/src/main/java/com/ldtteam/structurize/placement/handlers/placement/PlacementHandlers.java
+++ b/src/main/java/com/ldtteam/structurize/placement/handlers/placement/PlacementHandlers.java
@@ -32,7 +32,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.concurrent.locks.Lock;
 
 import static com.ldtteam.structurize.api.constants.Constants.UPDATE_FLAG;
 
@@ -913,12 +912,10 @@ public boolean doesWorldStateMatchBlueprintState(
 
     public static class ContainerPlacementHandler implements IPlacementHandler
     {
-        public static Set<Block> CONTAINERS = Set.of();
-
         @Override
         public boolean canHandle(final Level world, final BlockPos pos, final BlockState blockState)
         {
-            return CONTAINERS.contains(blockState.getBlock());
+            return blockState.getBlock() instanceof BaseEntityBlock;
         }
 
         @Override