diff --git a/arch/x86/configs/hulk_defconfig b/arch/x86/configs/hulk_defconfig
index 4effeb69653c51f904edb208c6d71608fa671577..6603d48c55281c16a02b395e2eb832fe1459e4ef 100644
--- a/arch/x86/configs/hulk_defconfig
+++ b/arch/x86/configs/hulk_defconfig
@@ -440,9 +440,11 @@ CONFIG_HAVE_LIVEPATCH_FTRACE=y
 # Enable Livepatch
 #
 CONFIG_LIVEPATCH=y
-CONFIG_LIVEPATCH_FTRACE=y
-CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY=y
-CONFIG_LIVEPATCH_STACK=y
+# CONFIG_LIVEPATCH_FTRACE is not set
+CONFIG_LIVEPATCH_WO_FTRACE=y
+CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY=y
+# CONFIG_LIVEPATCH_STACK is not set
+CONFIG_LIVEPATCH_RESTRICT_KPROBE=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
diff --git a/arch/x86/configs/syzkaller_defconfig b/arch/x86/configs/syzkaller_defconfig
index d7444f80338244e8316df55e703ba6adb190898e..b49b631bcc256bbac4b69e08cb290697f625571f 100644
--- a/arch/x86/configs/syzkaller_defconfig
+++ b/arch/x86/configs/syzkaller_defconfig
@@ -438,9 +438,11 @@ CONFIG_HAVE_LIVEPATCH_FTRACE=y
 # Enable Livepatch
 #
 CONFIG_LIVEPATCH=y
-CONFIG_LIVEPATCH_FTRACE=y
-CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY=y
-CONFIG_LIVEPATCH_STACK=y
+# CONFIG_LIVEPATCH_FTRACE is not set
+CONFIG_LIVEPATCH_WO_FTRACE=y
+CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY=y
+# CONFIG_LIVEPATCH_STACK is not set
+CONFIG_LIVEPATCH_RESTRICT_KPROBE=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y