diff --git a/debian/changelog b/debian/changelog
index 0cf82d8..4b18de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-imx (12-4) mendel-eagle; urgency=medium
+
+  * defconfig: Switch apex/gasket to modules instead of inbuilt.
+
+ -- Coral <coral-support@google.com>  Tue, 8 Jun 2021 11:41:29 -0600
+
 linux-imx (12-3) mendel-eagle; urgency=medium
 
   * pcie: Update pcie vreg regulators with new NXP patches
diff --git a/debian/defconfig b/debian/defconfig
index 81605af..f374ab4 100644
--- a/debian/defconfig
+++ b/debian/defconfig
@@ -30,8 +30,8 @@
 CONFIG_LOCALVERSION_AUTO=n
 CONFIG_IMX8MQ_PHANBELL_POWERSAVE=n
 CONFIG_DRM_PANEL_TIANMA_S6D6FP0A2=y
-CONFIG_STAGING_GASKET_FRAMEWORK=y
-CONFIG_STAGING_APEX_DRIVER=y
+CONFIG_STAGING_GASKET_FRAMEWORK=m
+CONFIG_STAGING_APEX_DRIVER=m
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGETFS=y
 CONFIG_USB_FUNCTIONFS=y