diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index d63e39fda..4c3dc56f5 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \
     libaudioutils \
     libfilterpack_imageproc \
     libgabi++ \
-    libkeystore \
     libmdnssd \
     libnfc_ndef \
     libportable \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 7fbdee6ad..8d9ba15c1 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -52,6 +52,7 @@ PRODUCT_PACKAGES += \
     libdrmframework \
     libdrmframework_jni \
     libfilterfw \
+    libkeystore \
     libsqlite_jni \
     libwilhelm \
     logd \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 9c40206a8..c1274422b 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -57,6 +57,7 @@ PRODUCT_PACKAGES += \
     libOpenSLES \
     libdownmix \
     libfilterfw \
+    libkeystore \
     libsqlite_jni \
     libwilhelm \
     make_ext4fs \