diff --git a/ubuntu16.04/nvidia-driver b/ubuntu16.04/nvidia-driver
index 7786b22d..9164738f 100755
--- a/ubuntu16.04/nvidia-driver
+++ b/ubuntu16.04/nvidia-driver
@@ -27,7 +27,7 @@ _cleanup_package_cache() {
 # Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
 _resolve_kernel_version() {
     local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
-      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
+     sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.](([0-9]+)(-[a-zA-Z0-9]+)?).*/\1-\3/p'| head -1)
     local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
     kernel_flavor="${kernel_flavor//virtual/generic}"
 
diff --git a/ubuntu18.04/nvidia-driver b/ubuntu18.04/nvidia-driver
index c61c8454..84ae7cd6 100755
--- a/ubuntu18.04/nvidia-driver
+++ b/ubuntu18.04/nvidia-driver
@@ -30,7 +30,7 @@ _cleanup_package_cache() {
 # Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
 _resolve_kernel_version() {
     local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
-      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
+      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.](([0-9]+)(-[a-zA-Z0-9]+)?).*/\1-\3/p'| head -1)
     local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
     kernel_flavor="${kernel_flavor//virtual/generic}"
 
diff --git a/ubuntu20.04/nvidia-driver b/ubuntu20.04/nvidia-driver
index 248e7f4e..2d42e706 100755
--- a/ubuntu20.04/nvidia-driver
+++ b/ubuntu20.04/nvidia-driver
@@ -46,7 +46,7 @@ _update_ca_certificates() {
 # Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
 _resolve_kernel_version() {
     local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
-      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
+      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.](([0-9]+)(-[a-zA-Z0-9]+)?).*/\1-\3/p'| head -1)
     local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
     kernel_flavor="${kernel_flavor//virtual/generic}"
 
diff --git a/ubuntu22.04/nvidia-driver b/ubuntu22.04/nvidia-driver
index da3ec8e3..bfd9fbb4 100755
--- a/ubuntu22.04/nvidia-driver
+++ b/ubuntu22.04/nvidia-driver
@@ -58,7 +58,7 @@ _update_ca_certificates() {
 # Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
 _resolve_kernel_version() {
     local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
-      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
+      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.](([0-9]+)(-[a-zA-Z0-9]+)?).*/\1-\3/p'| head -1)
     local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
     kernel_flavor="${kernel_flavor//virtual/generic}"
 
diff --git a/ubuntu24.04/nvidia-driver b/ubuntu24.04/nvidia-driver
index 2449628f..a5c43b84 100755
--- a/ubuntu24.04/nvidia-driver
+++ b/ubuntu24.04/nvidia-driver
@@ -68,7 +68,7 @@ _update_ca_certificates() {
 # Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
 _resolve_kernel_version() {
     local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
-      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
+      sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.](([0-9]+)(-[a-zA-Z0-9]+)?).*/\1-\3/p'| head -1)
     local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
     kernel_flavor="${kernel_flavor//virtual/generic}"