diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index cb00508..5b4b400 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -581,94 +581,6 @@ _tkg_srcprep() {
   _enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "CMDLINE_BOOL" "CONFIG_BLK_DEV_LOOP"
   _disable "DEBUG_FORCE_FUNCTION_ALIGN_64B"
   scripts/config --set-str "ZSWAP_COMPRESSOR_DEFAULT" "lz4"
-  if [ "$_futex2" = "true" ] && [ "$_futex_waitv" != "true" ] && [ "$_basever" != "54" ] && [ "$_basever" != "57" ] && [ "$_basever" != "58" ] && [ "$_basever" != "59" ]; then
-    sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config
-    echo -e "\r# start of config expert\r
-# CONFIG_DEBUG_RSEQ is not set\r
-# CONFIG_PC104 is not set\r
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set\r
-# CONFIG_SLOB is not set\r
-# CONFIG_PROCESSOR_SELECT is not set\r
-# CONFIG_SUSPEND_SKIP_SYNC is not set\r
-# CONFIG_DPM_WATCHDOG is not set\r
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set\r
-# CONFIG_PCI_CNB20LE_QUIRK is not set\r
-# CONFIG_ISA_BUS is not set\r
-CONFIG_KVM_WERROR=y\r
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set\r
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set\r
-# CONFIG_PCIE_BUS_TUNE_OFF is not set\r
-CONFIG_PCIE_BUS_DEFAULT=y\r
-# CONFIG_PCIE_BUS_SAFE is not set\r
-# CONFIG_PCIE_BUS_PERFORMANCE is not set\r
-# CONFIG_PCIE_BUS_PEER2PEER is not set\r
-# CONFIG_PATA_PLATFORM is not set\r
-# CONFIG_TTY_PRINTK is not set\r
-# CONFIG_GPIO_SYSFS is not set\r
-# CONFIG_VIDEO_TDA1997X is not set\r
-# CONFIG_VIDEO_TLV320AIC23B is not set\r
-# CONFIG_VIDEO_ADV7180 is not set\r
-# CONFIG_VIDEO_ADV7183 is not set\r
-# CONFIG_VIDEO_ADV7604 is not set\r
-# CONFIG_VIDEO_ADV7842 is not set\r
-# CONFIG_VIDEO_BT819 is not set\r
-# CONFIG_VIDEO_BT856 is not set\r
-# CONFIG_VIDEO_BT866 is not set\r
-# CONFIG_VIDEO_KS0127 is not set\r
-# CONFIG_VIDEO_ML86V7667 is not set\r
-# CONFIG_VIDEO_SAA7110 is not set\r
-# CONFIG_VIDEO_TC358743 is not set\r
-# CONFIG_VIDEO_TVP514X is not set\r
-# CONFIG_VIDEO_TVP7002 is not set\r
-# CONFIG_VIDEO_TW9910 is not set\r
-# CONFIG_VIDEO_VPX3220 is not set\r
-# CONFIG_VIDEO_SAA7185 is not set\r
-# CONFIG_VIDEO_ADV7170 is not set\r
-# CONFIG_VIDEO_ADV7175 is not set\r
-# CONFIG_VIDEO_ADV7343 is not set\r
-# CONFIG_VIDEO_ADV7393 is not set\r
-# CONFIG_VIDEO_ADV7511 is not set\r
-# CONFIG_VIDEO_AD9389B is not set\r
-# CONFIG_VIDEO_AK881X is not set\r
-# CONFIG_VIDEO_THS8200 is not set\r
-# CONFIG_VIDEO_THS7303 is not set\r
-# CONFIG_VIDEO_I2C is not set\r
-# CONFIG_VIDEO_ST_MIPID02 is not set\r
-# CONFIG_VIDEO_GS1662 is not set\r
-# CONFIG_MEDIA_TUNER_MSI001 is not set\r
-# CONFIG_DVB_S5H1432 is not set\r
-# CONFIG_DVB_DIB9000 is not set\r
-# CONFIG_DVB_CXD2880 is not set\r
-# CONFIG_DVB_MN88443X is not set\r
-# CONFIG_DVB_LNBH29 is not set\r
-# CONFIG_DVB_LGS8GL5 is not set\r
-# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set\r
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set\r
-# CONFIG_DRM_I915_WERROR is not set\r
-# CONFIG_DRM_I915_DEBUG is not set\r
-# CONFIG_DRM_I915_DEBUG_MMIO is not set\r
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set\r
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set\r
-# CONFIG_DRM_I915_DEBUG_GUC is not set\r
-# CONFIG_DRM_I915_SELFTEST is not set\r
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set\r
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set\r
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set\r
-# CONFIG_FB_INTEL is not set\r
-# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set\r
-# CONFIG_USB_KBD is not set\r
-# CONFIG_USB_MOUSE is not set\r
-# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set\r
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set\r
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y\r
-CONFIG_DEBUG_INFO_BTF_MODULES=y\r
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set\r
-# CONFIG_WIRELESS_WDS is not set\r
-# CONFIG_UNWINDER_GUESS is not set\r
-# CONFIG_TRIM_UNUSED_KSYMS is not set\r
-# CONFIG_VMLINUX_MAP is not set\r
-# end of config expert\n">> ./.config
-  fi
   scripts/config --set-str "CMDLINE" "${_custom_commandline}"
   _disable "CMDLINE_OVERRIDE" "X86_P6_NOP" "CPU_FREQ_DEFAULT_GOV_ONDEMAND" "CPU_FREQ_DEFAULT_GOV_CONSERVATIVE"
   #echo "# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set" >> ./.config
@@ -1208,6 +1120,95 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
     fi
   fi
 
+  if [ "$_futex2" = "true" ] && [ "$_futex_waitv" != "true" ] && [ "$_basever" != "54" ] && [ "$_basever" != "57" ] && [ "$_basever" != "58" ] && [ "$_basever" != "59" ]; then
+    sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config
+    echo -e "\r# start of config expert\r
+# CONFIG_DEBUG_RSEQ is not set\r
+# CONFIG_PC104 is not set\r
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set\r
+# CONFIG_SLOB is not set\r
+# CONFIG_PROCESSOR_SELECT is not set\r
+# CONFIG_SUSPEND_SKIP_SYNC is not set\r
+# CONFIG_DPM_WATCHDOG is not set\r
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set\r
+# CONFIG_PCI_CNB20LE_QUIRK is not set\r
+# CONFIG_ISA_BUS is not set\r
+CONFIG_KVM_WERROR=y\r
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set\r
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set\r
+# CONFIG_PCIE_BUS_TUNE_OFF is not set\r
+CONFIG_PCIE_BUS_DEFAULT=y\r
+# CONFIG_PCIE_BUS_SAFE is not set\r
+# CONFIG_PCIE_BUS_PERFORMANCE is not set\r
+# CONFIG_PCIE_BUS_PEER2PEER is not set\r
+# CONFIG_PATA_PLATFORM is not set\r
+# CONFIG_TTY_PRINTK is not set\r
+# CONFIG_GPIO_SYSFS is not set\r
+# CONFIG_VIDEO_TDA1997X is not set\r
+# CONFIG_VIDEO_TLV320AIC23B is not set\r
+# CONFIG_VIDEO_ADV7180 is not set\r
+# CONFIG_VIDEO_ADV7183 is not set\r
+# CONFIG_VIDEO_ADV7604 is not set\r
+# CONFIG_VIDEO_ADV7842 is not set\r
+# CONFIG_VIDEO_BT819 is not set\r
+# CONFIG_VIDEO_BT856 is not set\r
+# CONFIG_VIDEO_BT866 is not set\r
+# CONFIG_VIDEO_KS0127 is not set\r
+# CONFIG_VIDEO_ML86V7667 is not set\r
+# CONFIG_VIDEO_SAA7110 is not set\r
+# CONFIG_VIDEO_TC358743 is not set\r
+# CONFIG_VIDEO_TVP514X is not set\r
+# CONFIG_VIDEO_TVP7002 is not set\r
+# CONFIG_VIDEO_TW9910 is not set\r
+# CONFIG_VIDEO_VPX3220 is not set\r
+# CONFIG_VIDEO_SAA7185 is not set\r
+# CONFIG_VIDEO_ADV7170 is not set\r
+# CONFIG_VIDEO_ADV7175 is not set\r
+# CONFIG_VIDEO_ADV7343 is not set\r
+# CONFIG_VIDEO_ADV7393 is not set\r
+# CONFIG_VIDEO_ADV7511 is not set\r
+# CONFIG_VIDEO_AD9389B is not set\r
+# CONFIG_VIDEO_AK881X is not set\r
+# CONFIG_VIDEO_THS8200 is not set\r
+# CONFIG_VIDEO_THS7303 is not set\r
+# CONFIG_VIDEO_I2C is not set\r
+# CONFIG_VIDEO_ST_MIPID02 is not set\r
+# CONFIG_VIDEO_GS1662 is not set\r
+# CONFIG_MEDIA_TUNER_MSI001 is not set\r
+# CONFIG_DVB_S5H1432 is not set\r
+# CONFIG_DVB_DIB9000 is not set\r
+# CONFIG_DVB_CXD2880 is not set\r
+# CONFIG_DVB_MN88443X is not set\r
+# CONFIG_DVB_LNBH29 is not set\r
+# CONFIG_DVB_LGS8GL5 is not set\r
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set\r
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set\r
+# CONFIG_DRM_I915_WERROR is not set\r
+# CONFIG_DRM_I915_DEBUG is not set\r
+# CONFIG_DRM_I915_DEBUG_MMIO is not set\r
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set\r
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set\r
+# CONFIG_DRM_I915_DEBUG_GUC is not set\r
+# CONFIG_DRM_I915_SELFTEST is not set\r
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set\r
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set\r
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set\r
+# CONFIG_FB_INTEL is not set\r
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set\r
+# CONFIG_USB_KBD is not set\r
+# CONFIG_USB_MOUSE is not set\r
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set\r
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set\r
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y\r
+CONFIG_DEBUG_INFO_BTF_MODULES=y\r
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set\r
+# CONFIG_WIRELESS_WDS is not set\r
+# CONFIG_UNWINDER_GUESS is not set\r
+# CONFIG_TRIM_UNUSED_KSYMS is not set\r
+# CONFIG_VMLINUX_MAP is not set\r
+# end of config expert\n">> ./.config
+  fi
+
   # winesync support
   tkgpatch="$srcdir/0007-v${_basekernel}-winesync.patch"
   if [ -e "$tkgpatch" ]; then