diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
index cfdaf484..5303cd03 100644
--- a/configs/aarch64_defconfig
+++ b/configs/aarch64_defconfig
@@ -119,7 +119,7 @@ BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
-BR2_PACKAGE_CLIXON_RESTCONF_FCGI=y
+BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_SULOGIN=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
@@ -130,7 +130,6 @@ BR2_PACKAGE_FINIT_PLUGIN_RTC=y
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IFUPDOWN_NG=y
-BR2_PACKAGE_MECH=y
 BR2_PACKAGE_P_NET=y
 BR2_PACKAGE_P_NET_MAX_SUBSLOTS=12
 BR2_PACKAGE_P_NET_MAX_PHYSICAL_PORTS=10
diff --git a/configs/amd64_defconfig b/configs/amd64_defconfig
index d27a0540..d81e85d4 100644
--- a/configs/amd64_defconfig
+++ b/configs/amd64_defconfig
@@ -122,7 +122,7 @@ BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
-BR2_PACKAGE_CLIXON_RESTCONF_FCGI=y
+BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_SULOGIN=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
@@ -133,7 +133,6 @@ BR2_PACKAGE_FINIT_PLUGIN_RTC=y
 BR2_PACKAGE_FINIT_PLUGIN_TTY=y
 BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y
 BR2_PACKAGE_IFUPDOWN_NG=y
-BR2_PACKAGE_MECH=y
 BR2_PACKAGE_P_NET=y
 BR2_PACKAGE_P_NET_MAX_SUBSLOTS=12
 BR2_PACKAGE_P_NET_MAX_PHYSICAL_PORTS=10