diff --git a/components/V4L2DecodeInterface.cpp b/components/V4L2DecodeInterface.cpp
index e8c7996b4d98c165bbb20439885be505241d74a2..5764c18e51436f9bae316270f7b61541aea4b8a7 100644
--- a/components/V4L2DecodeInterface.cpp
+++ b/components/V4L2DecodeInterface.cpp
@@ -329,7 +329,7 @@ V4L2DecodeInterface::V4L2DecodeInterface(const std::string& name,
     const C2Allocator::id_t inputAllocators[] = {secureMode ? V4L2AllocatorId::SECURE_LINEAR
                                                             : C2AllocatorStore::DEFAULT_LINEAR};
 
-    const C2Allocator::id_t outputAllocators[] = {V4L2AllocatorId::V4L2_BUFFERPOOL};
+    const C2Allocator::id_t outputAllocators[] = {C2PlatformAllocatorStore::GRALLOC};
     const C2Allocator::id_t surfaceAllocator =
             secureMode ? V4L2AllocatorId::SECURE_GRAPHIC : C2PlatformAllocatorStore::BUFFERQUEUE;
     const C2BlockPool::local_id_t outputBlockPools[] = {C2BlockPool::BASIC_GRAPHIC};
diff --git a/components/VideoFramePool.cpp b/components/VideoFramePool.cpp
index 070cc40a0606b6a463f3246b7126d8d1523229b3..4bf45f3fd02fc9e96e87286e015697035f17d9f1 100644
--- a/components/VideoFramePool.cpp
+++ b/components/VideoFramePool.cpp
@@ -43,7 +43,7 @@ std::optional<uint32_t> VideoFramePool::getBufferIdFromGraphicBlock(C2BlockPool&
         }
         return dmabufId.value();
     }
-    case V4L2AllocatorId::V4L2_BUFFERPOOL:
+    case C2PlatformAllocatorStore::GRALLOC:
         FALLTHROUGH;
     case V4L2AllocatorId::SECURE_LINEAR: {
         std::shared_ptr<_C2BlockPoolData> blockPoolData =
@@ -75,7 +75,7 @@ std::unique_ptr<VideoFramePool> VideoFramePool::Create(
     uint64_t usage = static_cast<uint64_t>(BufferUsage::VIDEO_DECODER);
     if (isSecure) {
         usage |= C2MemoryUsage::READ_PROTECTED;
-    } else if (blockPool->getAllocatorId() == android::V4L2AllocatorId::V4L2_BUFFERPOOL) {
+    } else if (blockPool->getAllocatorId() == C2PlatformAllocatorStore::GRALLOC) {
         // CPU access to buffers is only required in byte buffer mode.
         usage |= C2MemoryUsage::CPU_READ;
     }
diff --git a/plugin_store/V4L2PluginStore.cpp b/plugin_store/V4L2PluginStore.cpp
index a8cdab69aa0824ae3d1f5602dd4a21d02b7180ed..9f9f2622a29935d6f725afbaf83e68894d0c1118 100644
--- a/plugin_store/V4L2PluginStore.cpp
+++ b/plugin_store/V4L2PluginStore.cpp
@@ -66,9 +66,6 @@ C2BlockPool* createBlockPool(C2Allocator::id_t allocatorId, C2BlockPool::local_i
     }
 
     switch (allocatorId) {
-    case V4L2AllocatorId::V4L2_BUFFERPOOL:
-        return new C2PooledBlockPool(allocator, poolId);
-
     case V4L2AllocatorId::SECURE_LINEAR:
         return new C2PooledBlockPool(allocator, poolId);
 
diff --git a/plugin_store/include/v4l2_codec2/plugin_store/V4L2AllocatorId.h b/plugin_store/include/v4l2_codec2/plugin_store/V4L2AllocatorId.h
index 45a470c16d3010781950a7748fe99bc8fc04a05d..2353076405ca21062fa5e998c10604e155258e25 100644
--- a/plugin_store/include/v4l2_codec2/plugin_store/V4L2AllocatorId.h
+++ b/plugin_store/include/v4l2_codec2/plugin_store/V4L2AllocatorId.h
@@ -12,8 +12,7 @@ namespace V4L2AllocatorId {
 
 // The allocator ids used for V4L2DecodeComponent.
 enum : C2AllocatorStore::id_t {
-    V4L2_BUFFERPOOL = C2PlatformAllocatorStore::PLATFORM_END,
-    SECURE_LINEAR,
+    SECURE_LINEAR = C2PlatformAllocatorStore::PLATFORM_END,
     SECURE_GRAPHIC,
 };