diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 916b049..295f19f 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -702,8 +702,8 @@ _tkg_srcprep() {
   if [ "$_basever" = "54" ] || [ "$_basever" = "59" ]; then
     scripts/config --set-val "RCU_BOOST_DELAY" "0"
   fi
-  _disable "NTP_PPS" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF" "ZSWAP_COMPRESSOR_DEFAULT_LZO" "PROFILE_ALL_BRANCHES" "CONTEXT_TRACKING_FORCE"
-  _enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "CMDLINE_BOOL" "BLK_DEV_LOOP" "X86_AMD_PSTATE" "AMD_PINCTRL"
+  _disable "NTP_PPS" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF" "ZSWAP_COMPRESSOR_DEFAULT_LZO" "PROFILE_ALL_BRANCHES"
+  _enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "CMDLINE_BOOL" "BLK_DEV_LOOP" "X86_AMD_PSTATE" "AMD_PINCTRL" "CONTEXT_TRACKING_FORCE"
   _disable "DEBUG_FORCE_FUNCTION_ALIGN_64B"
   scripts/config --set-str "ZSWAP_COMPRESSOR_DEFAULT" "lz4"
   scripts/config --set-str "CMDLINE" "${_custom_commandline}"
@@ -1161,7 +1161,7 @@ _tkg_srcprep() {
     _disable "NO_HZ_FULL_NODEF" "NO_HZ_IDLE" "NO_HZ_FULL" "NO_HZ" "NO_HZ_COMMON" "VIRT_CPU_ACCOUNTING_GEN"
     _enable "HZ_PERIODIC" "TICK_CPU_ACCOUNTING"
   elif [ "$_tickless" = "1" ]; then
-    _disable "HZ_PERIODIC" "NO_HZ_IDLE" "CONTEXT_TRACKING_FORCE" "TICK_CPU_ACCOUNTING"
+    _disable "HZ_PERIODIC" "NO_HZ_IDLE" "TICK_CPU_ACCOUNTING"
     _enable "NO_HZ_FULL_NODEF" "NO_HZ_FULL" "NO_HZ" "NO_HZ_COMMON" "CONTEXT_TRACKING" "VIRT_CPU_ACCOUNTING_GEN"
   else
     _disable "NO_HZ_FULL_NODEF" "HZ_PERIODIC" "NO_HZ_FULL" "TICK_CPU_ACCOUNTING"