diff --git a/training/intel-bootc/Containerfile b/training/intel-bootc/Containerfile
index 93d37d3..13cf0fa 100644
--- a/training/intel-bootc/Containerfile
+++ b/training/intel-bootc/Containerfile
@@ -15,8 +15,9 @@ RUN if [ "${OS_VERSION_MAJOR}" == "" ]; then \
        export TARGET_ARCH=$(arch) ;\
        fi \
     && if [ "${KERNEL_VERSION}" == "" ]; then \
-       RELEASE=$(dnf info --installed kernel-core | grep Release | awk -F: '{print $2}' | tr -d '[:blank:]') \
-       && VERSION=$(dnf info --installed kernel-core | grep Version | awk -F: '{print $2}' | tr -d '[:blank:]') \
+        NEWER_KERNEL_CORE=$(dnf info kernel-core | awk -F: '/^Source/{gsub(/.src.rpm/, "", $2); print $2}' | sort -n | tail -n1) \
+        && RELEASE=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Release/{print $2}' | tr -d '[:blank:]') \
+        && VERSION=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Version/{print $2}' | tr -d '[:blank:]') \
        && export KERNEL_VERSION="${VERSION}-${RELEASE}" ;\
        fi \
     && dnf install -y make git kernel-devel-${KERNEL_VERSION} \
@@ -62,9 +63,10 @@ ARG INSTRUCTLAB_IMAGE
 ARG VLLM_IMAGE
 
 RUN if [ "${KERNEL_VERSION}" == "" ]; then \
-        RELEASE=$(dnf info --installed kernel-core | grep Release | awk -F: '{print $2}' | tr -d '[:blank:]') \
-        && VERSION=$(dnf info --installed kernel-core | grep Version | awk -F: '{print $2}' | tr -d '[:blank:]') \
-        && export KERNEL_VERSION="${VERSION}-${RELEASE}" ;\
+       NEWER_KERNEL_CORE=$(dnf info kernel-core | awk -F: '/^Source/{gsub(/.src.rpm/, "", $2); print $2}' | sort -n | tail -n1) \
+       && RELEASE=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Release/{print $2}' | tr -d '[:blank:]') \
+       && VERSION=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Version/{print $2}' | tr -d '[:blank:]') \
+       && export KERNEL_VERSION="${VERSION}-${RELEASE}" ;\
     fi \
     && if [ "${TARGET_ARCH}" == "" ]; then \
        export TARGET_ARCH=$(arch) ;\
diff --git a/training/nvidia-bootc/Containerfile b/training/nvidia-bootc/Containerfile
index 008f0fb..5606f39 100644
--- a/training/nvidia-bootc/Containerfile
+++ b/training/nvidia-bootc/Containerfile
@@ -22,8 +22,9 @@ COPY --chown=1001:0 x509-configuration.ini x509-configuration.ini
 COPY build/usr /usr
 
 RUN if [ "${KERNEL_VERSION}" == "" ]; then \
-        RELEASE=$(dnf info kernel-core | grep Release | awk -F: '{print $2}' | tr -d '[:blank:]') \
-        && VERSION=$(dnf info kernel-core | grep Version | awk -F: '{print $2}' | tr -d '[:blank:]') \
+        NEWER_KERNEL_CORE=$(dnf info kernel-core | awk -F: '/^Source/{gsub(/.src.rpm/, "", $2); print $2}' | sort -n | tail -n1) \
+        && RELEASE=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Release/{print $2}' | tr -d '[:blank:]') \
+        && VERSION=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Version/{print $2}' | tr -d '[:blank:]') \
         && export KERNEL_VERSION="${VERSION}-${RELEASE}" ;\
     fi \
     && if [ "${OS_VERSION_MAJOR}" == "" ]; then \
diff --git a/training/nvidia-bootc/Containerfile.builder b/training/nvidia-bootc/Containerfile.builder
index f7eab57..7570761 100644
--- a/training/nvidia-bootc/Containerfile.builder
+++ b/training/nvidia-bootc/Containerfile.builder
@@ -6,8 +6,9 @@ ARG ENABLE_RT=''
 USER root
 
 RUN if [ "${KERNEL_VERSION}" == "" ]; then \
-        RELEASE=$(dnf info kernel-core | grep Release | awk -F: '{print $2}' | tr -d '[:blank:]') \
-        && VERSION=$(dnf info kernel-core | grep Version | awk -F: '{print $2}' | tr -d '[:blank:]') \
+        NEWER_KERNEL_CORE=$(dnf info kernel-core | awk -F: '/^Source/{gsub(/.src.rpm/, "", $2); print $2}' | sort -n | tail -n1) \
+        && RELEASE=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Release/{print $2}' | tr -d '[:blank:]') \
+        && VERSION=$(dnf info ${NEWER_KERNEL_CORE} | awk -F: '/^Version/{print $2}' | tr -d '[:blank:]') \
         && export KERNEL_VERSION="${VERSION}-${RELEASE}" ;\
         fi \
     && echo "${KERNEL_VERSION}" \