diff --git a/.kernel.metadata b/.kernel.metadata
index 83c584f..5ad2e81 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,2 +1,2 @@
 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd  SOURCES/linux-5.4.tar.xz
-cf83e306f80880c9cad081e996eea51e8ec25531  SOURCES/patch-5.4.209.xz
+000c09e6f5877736257b310ae92c413674c5f912  SOURCES/patch-5.4.218.xz
diff --git a/SOURCES/kernel-i686-debug-fedora.config b/SOURCES/kernel-i686-debug-fedora.config
index 2281e21..f048481 100644
--- a/SOURCES/kernel-i686-debug-fedora.config
+++ b/SOURCES/kernel-i686-debug-fedora.config
@@ -4511,6 +4511,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
+# CONFIG_RETHUNK is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
diff --git a/SOURCES/kernel-i686-fedora.config b/SOURCES/kernel-i686-fedora.config
index 368249d..31ac5ff 100644
--- a/SOURCES/kernel-i686-fedora.config
+++ b/SOURCES/kernel-i686-fedora.config
@@ -4491,6 +4491,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
+# CONFIG_RETHUNK is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config
index b42c105..d4cfd7d 100644
--- a/SOURCES/kernel-x86_64-debug-fedora.config
+++ b/SOURCES/kernel-x86_64-debug-fedora.config
@@ -874,6 +874,7 @@ CONFIG_CPU_IDLE_GOV_HALTPOLL=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_ISOLATION=y
+CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
@@ -4556,6 +4557,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config
index 80059b7..96e825d 100644
--- a/SOURCES/kernel-x86_64-fedora.config
+++ b/SOURCES/kernel-x86_64-fedora.config
@@ -873,6 +873,7 @@ CONFIG_CPU_IDLE_GOV_HALTPOLL=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_ISOLATION=y
+CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
@@ -4536,6 +4537,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 80e02fc..55d1304 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -89,7 +89,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 209
+%define stable_update 218
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -3009,6 +3009,9 @@ fi
 #
 #
 %changelog
+* Sat Oct 15 2022 Pablo Greco <pgreco@centosproject.org> - 5.4.218-200
+- Update to version v5.4.218
+
 * Sun Aug  7 2022 Pablo Greco <pgreco@centosproject.org> - 5.4.209-200
 - Update to version v5.4.209