diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec
index 285de1978..28d8945d4 100755
--- a/pkg/fedora/kernel-surface/kernel-surface.spec
+++ b/pkg/fedora/kernel-surface/kernel-surface.spec
@@ -2,9 +2,9 @@
 # Definitions to configure the kernel we want to build
 #
 
-%global kernel_tag_fc37 kernel-5.19.16-301.fc37
-%global kernel_tag_fc36 kernel-5.19.16-201.fc36
-%global kernel_tag_fc35 kernel-5.19.16-101.fc35
+%global kernel_tag_fc37 kernel-6.0.6-300.fc37
+%global kernel_tag_fc36 kernel-6.0.6-200.fc36
+%global kernel_tag_fc35 kernel-6.0.6-100.fc35
 
 %global kernel_release_fc37 1
 %global kernel_release_fc36 1
@@ -17,7 +17,7 @@
 %global fedora_title_fc36 36 (Thirty Six)
 %global fedora_title_fc35 35 (Thirty Five)
 
-%global ls_patches_commit edd7251c3ff21233d612a48555ec8061a61b7523
+%global ls_patches_commit 20fe99a7fca971756462a9c7b14c9adcd032540f
 
 %global sb_crt surface.crt
 %global sb_key surface.key
@@ -101,13 +101,11 @@ Patch0:     %{surface_source}/%{kernel_patches}/0001-surface3-oemb.patch
 Patch1:     %{surface_source}/%{kernel_patches}/0002-mwifiex.patch
 Patch2:     %{surface_source}/%{kernel_patches}/0003-ath10k.patch
 Patch3:     %{surface_source}/%{kernel_patches}/0004-ipts.patch
-Patch4:     %{surface_source}/%{kernel_patches}/0005-surface-sam.patch
-Patch5:     %{surface_source}/%{kernel_patches}/0006-surface-sam-over-hid.patch
-Patch6:     %{surface_source}/%{kernel_patches}/0007-surface-button.patch
-Patch7:     %{surface_source}/%{kernel_patches}/0008-surface-typecover.patch
-Patch8:     %{surface_source}/%{kernel_patches}/0009-surface-gpe.patch
-Patch9:     %{surface_source}/%{kernel_patches}/0010-cameras.patch
-Patch10:    %{surface_source}/%{kernel_patches}/0011-amd-gpio.patch
+Patch4:     %{surface_source}/%{kernel_patches}/0005-surface-sam-over-hid.patch
+Patch5:     %{surface_source}/%{kernel_patches}/0006-surface-button.patch
+Patch6:     %{surface_source}/%{kernel_patches}/0007-surface-typecover.patch
+Patch7:     %{surface_source}/%{kernel_patches}/0008-cameras.patch
+Patch8:     %{surface_source}/%{kernel_patches}/0009-amd-gpio.patch
 
 Patch100:   0001-Add-secureboot-pre-signing-to-the-kernel.patch