diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index fbac20c..96b1ae0 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -19,11 +19,6 @@
       <transport>hwbinder</transport>
       <fqname>@2.5::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>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 3ae2da6..de752c1 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -115,6 +115,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libsuspend
 
+# ConfigStore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # Debug
 $(call inherit-product, hardware/samsung-ext/interfaces/debug-tools/debug.mk)