diff --git a/lito.mk b/lito.mk
index 41e81c7..2d4b6e3 100644
--- a/lito.mk
+++ b/lito.mk
@@ -143,6 +143,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     Snap
 
+# Configstore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # Consumer IR
 PRODUCT_PACKAGES += \
     android.hardware.ir@1.0-impl \
diff --git a/manifest.xml b/manifest.xml
index 8992d6a..58b463e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -24,11 +24,6 @@
         <transport>hwbinder</transport>
         <fqname>@2.4::ICameraProvider/legacy/0</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::ISurfaceFlingerConfigs/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.drm</name>
         <transport>hwbinder</transport>