diff --git a/common.mk b/common.mk
index b18533e..9b815a6 100644
--- a/common.mk
+++ b/common.mk
@@ -65,6 +65,10 @@
     libsensorndkbridge \
     Snap
 
+# ConfigStore
+PRODUCT_PACKAGES += \
+    disable_configstore
+
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl:64 \
diff --git a/manifest.xml b/manifest.xml
index 6ba2367..ca3827a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -45,15 +45,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.configstore</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>ISurfaceFlingerConfigs</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.gatekeeper</name>
         <transport>hwbinder</transport>
         <version>1.0</version>