diff --git a/debian/rules b/debian/rules
index 97bc507..a8f8dcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ override_dh_auto_build:
 		KCFLAGS="${PVE_KERNEL_CFLAGS}" \
 		EXTRAVERSION="${EXTRAVERSION}" \
 		LOCALVERSION="${LOCALVERSION}" \
-		KBUILD_BUILD_VERSION_TIMESTAMP="${KVNAME} ${PVE_BUILD_PROFILE} (${PKG_DATE})"
+		KBUILD_BUILD_VERSION_TIMESTAMP="PVE Edge ${DEB_VERSION} ${PVE_BUILD_PROFILE} (${PKG_DATE})"
 	# ZFS
 	dh_auto_configure -D ${ZFS_SRC} -- CC="${PVE_ZFS_CC}" --with-config=kernel --with-linux=$(realpath ${KERNEL_SRC}) --with-linux-obj=$(realpath ${KERNEL_SRC})
 	dh_auto_build -D ${ZFS_SRC}
diff --git a/debian/rules.d/common.mk b/debian/rules.d/common.mk
index c89c273..b027826 100644
--- a/debian/rules.d/common.mk
+++ b/debian/rules.d/common.mk
@@ -2,9 +2,6 @@
 KERNEL_MAJMIN=$(shell ./scripts/version.sh -n)
 KERNEL_VER=$(shell ./scripts/version.sh -L)
 
-# Increment KERNEL_RELEASE if the ABI changes (abicheck target in debian/rules)
-KERNEL_RELEASE=1
-
 ## Debian package information
 PKG_RELEASE=$(shell ./scripts/version.sh -r)
 PKG_DATE:=$(shell dpkg-parsechangelog -SDate)
@@ -29,7 +26,7 @@ PVE_KERNEL_CC ?= ${CC}
 PVE_ZFS_CC ?= ${CC}
 
 ### Debian package names
-EXTRAVERSION=-${KERNEL_RELEASE}-${PKG_BUILD_FLAVOR}
+EXTRAVERSION=-${PKG_BUILD_FLAVOR}
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
 
 PVE_KERNEL_PKG=pve-kernel-${KVNAME}