diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 8a67a1373..036d9a543 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -7,7 +7,7 @@ name: Debian
 
 env:
   GPG_KEY_ID: 56C464BAAC421453
-  KERNEL_VERSION: 5.12.2
+  KERNEL_VERSION: 5.12.4
   KERNEL_REVISION: 1
   LOCALVERSION: -surface
   MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD
index b97d3bda5..ad5ebb6aa 100644
--- a/pkg/arch/kernel/PKGBUILD
+++ b/pkg/arch/kernel/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-surface
-pkgver=5.12.2.arch1
-pkgrel=3
+pkgver=5.12.4.arch2
+pkgrel=1
 pkgdesc='Linux'
 _shortver=${pkgver%.*}
 _fullver=${pkgver%.*}-${pkgver##*.}
@@ -42,8 +42,8 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
-sha256sums=('8b5f80129f813fd34184625547ad4b9f0b26f74cb1cd60d802c98d62708992f5'
-            '6dde032690644a576fd36c4a7d3546d9cec0117dd3fb17cea6dc95e907ef9bef'
+sha256sums=('ad6c408fefce32fa9589d273599afdff21205724ea41763bec58745aa42083b7'
+            '55c4cb76754b1db234a0994806106d8481c171d4e3fead12793f0083a48511d4'
             '252c7a78ffb1efe9751aabc93cc79031ef69dbc95baa7970cbaabcd5474fe7d8'
             '9474de18769968c5558fedda5be354fe0babf1365541d4d0ac8e1ac47d4bbb88'
             'a7be143e4bebeef77fe00da86e35ce9edee2c69b48d4638b062223746891a448'
diff --git a/pkg/arch/kernel/config b/pkg/arch/kernel/config
index 5975fd07b..aaa32aca0 100644
--- a/pkg/arch/kernel/config
+++ b/pkg/arch/kernel/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.12.2-arch1 Kernel Configuration
+# Linux/x86 5.12.4-arch1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100200
+CONFIG_GCC_VERSION=110100
 CONFIG_CLANG_VERSION=0
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=23601
@@ -12,6 +12,7 @@ CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -8603,7 +8604,6 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
-# CONFIG_AD9467 is not set
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -10144,8 +10144,8 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
@@ -10174,6 +10174,8 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ARCH_KCSAN=y
+CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
 # end of Generic Kernel Debugging Instruments
 
 CONFIG_DEBUG_KERNEL=y
@@ -10217,7 +10219,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_HAVE_ARCH_KFENCE=y
 CONFIG_KFENCE=y
 CONFIG_KFENCE_STATIC_KEYS=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=100
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
 # end of Memory Debugging
diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec
index be5940261..8010a9872 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_fc34 kernel-5.11.19-300.fc34
-%global kernel_tag_fc33 kernel-5.11.19-200.fc33
-%global kernel_tag_fc32 kernel-5.11.19-100.fc32
+%global kernel_tag_fc34 kernel-5.11.21-300.fc34
+%global kernel_tag_fc33 kernel-5.11.21-200.fc33
+%global kernel_tag_fc32 kernel-5.11.21-100.fc32
 
 %global kernel_release_fc34 1
 %global kernel_release_fc33 1