diff --git a/.SRCINFO b/.SRCINFO
index 10404cb..0d9ea20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-clear
 	pkgdesc = Clear Linux
 	pkgver = 5.10.31
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/clearlinux-pkgs/linux
 	arch = x86_64
 	license = GPL2
@@ -15,8 +15,8 @@ pkgbase = linux-clear
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.sign
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.10.31.xz
-	source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.10.19-1032
-	source = enable_additional_cpu_optimizations-20210327.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20210327.tar.gz
+	source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.10.31-1033
+	source = more-uarches-20210402.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20210402.tar.gz
 	source = pci-enable-overrides-for-missing-acs-capabilities.patch
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@@ -25,7 +25,7 @@ pkgbase = linux-clear
 	sha256sums = SKIP
 	sha256sums = 31dba2ffac90ed64577b9a5e18cf252faef3d5d27cffc552aebba48fff4b9adc
 	sha256sums = SKIP
-	sha256sums = ac0e44bd089eeb7f52d358e6899005599fff50972f090af9c8e6ee0097d01db6
+	sha256sums = 8aea0d8a9999b0510fa128d79af8a8dc94d25f0a193fd698ebfdf09808472d2e
 	sha256sums = 2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e
 	sha256sums = 261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865
 
diff --git a/PKGBUILD b/PKGBUILD
index cdf9b85..d99792e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -70,23 +70,23 @@ _use_current=
 _major=5.10
 _minor=31
 _srcname=linux-${_major}
-_clr=${_major}.19-1032
+_clr=${_major}.31-1033
 pkgbase=linux-clear
 pkgver=${_major}.${_minor}
-pkgrel=1
+pkgrel=2
 pkgdesc='Clear Linux'
 arch=('x86_64')
 url="https://github.com/clearlinux-pkgs/linux"
 license=('GPL2')
 makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
 options=('!strip')
-_gcc_more_v='20210327'
+_gcc_more_v='20210402'
 source=(
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign"
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
   "clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
-  "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
+  "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
   'pci-enable-overrides-for-missing-acs-capabilities.patch'
   '0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch'
 )
@@ -96,12 +96,6 @@ export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 prepare() {
-    # https://bbs.archlinux.org/viewtopic.php?id=265115
-
-    if [[ ! -f "$srcdir/patch-${pkgver}" ]]; then
-      xz -dc "$SRCDEST/patch-${pkgver}.xz" > "patch-${pkgver}"
-    fi
-
     cd ${_srcname}
 
     ### Add upstream patches
@@ -362,7 +356,7 @@ sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
             'SKIP'
             '31dba2ffac90ed64577b9a5e18cf252faef3d5d27cffc552aebba48fff4b9adc'
             'SKIP'
-            'ac0e44bd089eeb7f52d358e6899005599fff50972f090af9c8e6ee0097d01db6'
+            '8aea0d8a9999b0510fa128d79af8a8dc94d25f0a193fd698ebfdf09808472d2e'
             '2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e'
             '261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865')