diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 69bde633a..e47532ff6 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \
     libbcc \
     libfilterpack_imageproc \
     libgabi++ \
-    libkeystore \
     libmdnssd \
     libnfc_ndef \
     libportable \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index fc699731b..065f82ae3 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -51,6 +51,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 3e6cbd369..cd0cd6923 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -66,6 +66,7 @@ PRODUCT_PACKAGES += \
     libOpenSLES \
     libdownmix \
     libfilterfw \
+    libkeystore \
     libsqlite_jni \
     libwilhelm \
     make_ext4fs \