diff --git a/main/linux-postmarketos-stericsson/APKBUILD b/main/linux-postmarketos-stericsson/APKBUILD
index ca28c46a3..7c730d6b5 100644
--- a/main/linux-postmarketos-stericsson/APKBUILD
+++ b/main/linux-postmarketos-stericsson/APKBUILD
@@ -5,9 +5,8 @@
 _flavor="postmarketos-stericsson"
 _config="config-$_flavor.armv7"
 pkgname=linux-$_flavor
-pkgver=5.15_rc1
-pkgrel=1
-_tag="5.15-rc1"
+pkgver=5.15
+pkgrel=0
 pkgdesc="Mainline kernel fork for ST-Ericsson NovaThor devices"
 arch="armv7"
 _carch="arm"
@@ -31,14 +30,17 @@ makedepends="
 	perl
 	postmarketos-installkernel
 "
-
+case $pkgver in
+	*.*.*)	_kernver=${pkgver%.0};;
+	*.*)	_kernver=$pkgver;;
+esac
 source="
-	$pkgname-$_tag.tar.gz::https://git.kernel.org/torvalds/t/linux-$_tag.tar.gz
+	https://git.kernel.org/torvalds/t/linux-${pkgver//_/-}.tar.gz
 	config-$_flavor.armv7
 	emmc.patch
 	regulators.patch
 "
-builddir="$srcdir/linux-${_tag#v}"
+builddir="$srcdir/linux-${_kernver//_/-}"
 
 prepare() {
 	default_prepare
@@ -65,8 +67,8 @@ package() {
 }
 
 sha512sums="
-3f7303ed8387b9f0298d32c28ae17a48ccbab2232fb278868c76dbd3d8f2911cb25b725a4e79c77f1c0f7939bd6fde946ddf68ee5ace3cd9d1076470e6238109  linux-postmarketos-stericsson-5.15-rc1.tar.gz
-30028e5287f4d4df5355a385343daa388bf738f9b1f394c090601d89d10901b90dc46296d622b264882c943422cd9b8bd035e2b796a9879b89b7ca855cb7c8ac  config-postmarketos-stericsson.armv7
+f31ff70afa2c0b5a83f04d862187570174e477b92ac5d503f9fb1d1617a0e16d863b786495c321e41528c4a67ab050a5320b1d875555405a1e6e1f7a3c3b6cc4  linux-5.15.tar.gz
+19ac8f2394b71a3c1aff868fd986192218dd32085154e16241819cda511cb7451777c35f3e1fb289f59b2b271daa2bee199dd5a63fb8f70f081e7f695540c48f  config-postmarketos-stericsson.armv7
 d1bd4c1f04e67ab33f03285f8baf1187d4dde29b9c49711c56f31d4708296172295ea1ad153504f2a4e944ad3d80ddc12a7218dc0d79161089ed527fc4404632  emmc.patch
 8206d74c52328827502a32644f70fd149a72a78aaf936cd44f474b9153e8caccf73206df76e24004329edebab90e1a4a0e965630f4817aa5dd642d9ee2729295  regulators.patch
 "
diff --git a/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 b/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
index da1c44089..95bbb39ad 100644
--- a/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
+++ b/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.0-rc1 Kernel Configuration
+# Linux/arm 5.15.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100301
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23502
+CONFIG_AS_VERSION=23700
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23502
+CONFIG_LD_VERSION=23700
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -195,6 +195,7 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
+CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -544,28 +545,6 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options
 
-#
-# Firmware Drivers
-#
-
-#
-# ARM System Control and Management Interface Protocol
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-# end of ARM System Control and Management Interface Protocol
-
-# CONFIG_FW_CFG_SYSFS is not set
-# CONFIG_QCOM_SCM is not set
-# CONFIG_TRUSTED_FOUNDATIONS is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_HAVE_ARM_SMCCC=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
 # CONFIG_ARM_CRYPTO is not set
 CONFIG_AS_VFP_VMRS_FPINST=y
 
@@ -1359,12 +1338,33 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
-# CONFIG_SIMPLE_PM_BUS is not set
 # CONFIG_VEXPRESS_CONFIG is not set
 # CONFIG_MHI_BUS is not set
 # end of Bus devices
 
 # CONFIG_CONNECTOR is not set
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
+
+# CONFIG_FW_CFG_SYSFS is not set
+# CONFIG_TRUSTED_FOUNDATIONS is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+CONFIG_HAVE_ARM_SMCCC=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 # CONFIG_GNSS is not set
 # CONFIG_MTD is not set
 CONFIG_DTC=y
@@ -4564,7 +4564,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_NINTENDO_OTP is not set
 # CONFIG_NVMEM_RMEM is not set
 
 #