diff --git a/include/target.mk b/include/target.mk
index 791b031e95..6c4edd7862 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -47,13 +47,11 @@ DEFAULT_PACKAGES.router:=\
 	ppp-mod-pppoe
 # For easy usage
 DEFAULT_PACKAGES.tweak:=\
-	autocore \
 	block-mount \
 	default-settings-chn \
 	kmod-nf-nathelper \
 	kmod-nf-nathelper-extra \
 	luci-light \
-	luci-app-cpufreq \
 	luci-app-package-manager \
 	luci-compat \
 	luci-lib-base \
@@ -135,7 +133,7 @@ endif
 DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
 
 # Add tweaked packages
-# DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.tweak)
+DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.tweak)
 
 filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
 extra_packages = $(if $(filter wpad wpad-% nas,$(1)),iwinfo)
diff --git a/target/linux/armsr/Makefile b/target/linux/armsr/Makefile
index 02b0eda607..c552f0df03 100644
--- a/target/linux/armsr/Makefile
+++ b/target/linux/armsr/Makefile
@@ -13,7 +13,7 @@ KERNEL_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += mkf2fs e2fsprogs
+DEFAULT_PACKAGES += mkf2fs e2fsprogs automount autocore
 # blkid used for resolving PARTUUID
 # in sysupgrade. vfat required for
 # mounting ESP partition
diff --git a/target/linux/bcm27xx/Makefile b/target/linux/bcm27xx/Makefile
index 9be5c92133..297f32529a 100644
--- a/target/linux/bcm27xx/Makefile
+++ b/target/linux/bcm27xx/Makefile
@@ -26,7 +26,7 @@ DEFAULT_PACKAGES += \
 	kmod-usb-hid \
 	kmod-sound-core kmod-sound-arm-bcm2835 \
 	kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
-	partx-utils mkf2fs automount cpufreq
+	partx-utils mkf2fs automount autocore luci-app-cpufreq
 
 KERNELNAME:=Image dtbs
 
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
index 4f816d9532..665f26db67 100644
--- a/target/linux/ipq40xx/Makefile
+++ b/target/linux/ipq40xx/Makefile
@@ -18,6 +18,6 @@ DEFAULT_PACKAGES += \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
 	kmod-ath10k-ct wpad-openssl \
 	kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \
-	uboot-envtools automount cpufreq
+	uboot-envtools automount autocore luci-app-cpufreq
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile
index 27abd77464..61d9215d1f 100644
--- a/target/linux/ipq806x/Makefile
+++ b/target/linux/ipq806x/Makefile
@@ -21,6 +21,6 @@ DEFAULT_PACKAGES += \
 	kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
 	kmod-phy-qcom-ipq806x-usb kmod-usb3 kmod-usb-dwc3-qcom \
 	kmod-ath10k-ct wpad-openssl uboot-envtools \
-	automount cpufreq
+	automount autocore luci-app-cpufreq
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile
index 478b00488b..a384afe50f 100644
--- a/target/linux/mediatek/Makefile
+++ b/target/linux/mediatek/Makefile
@@ -12,6 +12,6 @@ KERNEL_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
-	kmod-leds-gpio kmod-gpio-button-hotplug
+	kmod-leds-gpio kmod-gpio-button-hotplug autocore
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index b279d818ed..7cf20ffcc0 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -13,6 +13,6 @@ KERNEL_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += uboot-envtools kmod-gpio-button-hotplug
+DEFAULT_PACKAGES += uboot-envtools kmod-gpio-button-hotplug autocore
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/qualcommax/Makefile b/target/linux/qualcommax/Makefile
index 3a211d1dea..2528b6bbb8 100644
--- a/target/linux/qualcommax/Makefile
+++ b/target/linux/qualcommax/Makefile
@@ -17,6 +17,6 @@ DEFAULT_PACKAGES += \
 	kmod-qca-nss-dp \
 	kmod-ath11k-ahb wpad-openssl \
 	uboot-envtools losetup \
-	automount cpufreq
+	automount autocore luci-app-cpufreq
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
index c40ff68316..7347145647 100644
--- a/target/linux/rockchip/Makefile
+++ b/target/linux/rockchip/Makefile
@@ -16,7 +16,7 @@ endef
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += uboot-envtools partx-utils mkf2fs kmod-gpio-button-hotplug \
-		    fdisk automount cpufreq
+		    fdisk automount autocore luci-app-cpufreq
 
 KERNELNAME:=Image dtbs
 
diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
index 5bf76b0d50..4b57da88be 100644
--- a/target/linux/sunxi/Makefile
+++ b/target/linux/sunxi/Makefile
@@ -26,6 +26,6 @@ KERNELNAME:=zImage dtbs
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += uboot-envtools
-DEFAULT_PACKAGES += partx-utils mkf2fs automount cpufreq
+DEFAULT_PACKAGES += partx-utils mkf2fs automount autocore luci-app-cpufreq
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index bf394ea372..41a9f3eb42 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -22,7 +22,7 @@ DEFAULT_PACKAGES += fdisk mkf2fs partx-utils kmod-button-hotplug kmod-e1000e kmo
 		    kmod-8139cp kmod-8139too kmod-fs-f2fs kmod-usb-hid kmod-usb-net \
 		    kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 \
 		    kmod-usb-net-rtl8152-vendor grub2-bios-setup intel-igpu-firmware-dmc \
-		    automount
+		    automount autocore
 
 $(eval $(call BuildTarget))