diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec
index ae1c65dfb..d97618908 100755
--- a/pkg/fedora/kernel-surface/kernel-surface.spec
+++ b/pkg/fedora/kernel-surface/kernel-surface.spec
@@ -2,8 +2,8 @@
 # Definitions to configure the kernel we want to build
 #
 
-%global kernel_tag_fc36 kernel-5.17.14-300.fc36
-%global kernel_tag_fc35 kernel-5.17.14-200.fc35
+%global kernel_tag_fc36 kernel-5.18.4-201.fc36
+%global kernel_tag_fc35 kernel-5.18.4-101.fc35
 
 %global kernel_release_fc36 1
 %global kernel_release_fc35 1
@@ -14,7 +14,7 @@
 %global fedora_title_fc36 36 (Thirty Six)
 %global fedora_title_fc35 35 (Thirty Five)
 
-%global ls_patches_commit d2956944b73c9554508ccf79b65ff842a5223b49
+%global ls_patches_commit afddc7d7410e03c9ada24f6f8814f588370cc756
 
 %global sb_crt surface.crt
 %global sb_key surface.key