diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml
index 39f65de6..021b7397 100644
--- a/.github/workflows/build-and-run.yml
+++ b/.github/workflows/build-and-run.yml
@@ -84,11 +84,12 @@ jobs:
       matrix:
         distro:
           [
-            "debian:10",
-            "debian:11",
-            "debian:bookworm",
-            "ubuntu:20.04",
-            "ubuntu:22.04",
+#            "debian:10",
+#            "debian:11",
+            "debian:12",
+            "debian:trixie",
+#            "ubuntu:20.04",
+#            "ubuntu:22.04",
           ]
     runs-on: ubuntu-latest
     container:
@@ -99,7 +100,8 @@ jobs:
           HEADERS_SUFFIX=`uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`;
           DISTRO=`echo ${{ matrix.distro }} |  sed 's/://'`;
           case "${{ matrix.distro }}" in
-          debian:bookworm) DISTRO=debian12; CPACK_TYPE=Debian12 ;;
+          debian:trixie) DISTRO=debian13; CPACK_TYPE=Debian13 ;;
+          debian:12) DISTRO=debian12; CPACK_TYPE=Debian12 ;;
           debian:11) CPACK_TYPE=Debian11 ;;
           debian:10) CPACK_TYPE=Debian10 ;;
           ubuntu:22.04) CPACK_TYPE=Ubuntu22 ; HEADERS_SUFFIX=generic ;;
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index e2b2b81a..fcde3ce7 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -26,20 +26,25 @@ jobs:
             untar: false
             format: qcow2
 
-          - distro: Debian12
-            image: https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-12-generic-amd64-daily.tar.xz
+          - distro: Debian13
+            image: https://cloud.debian.org/images/cloud/sid/daily/latest/debian-sid-generic-amd64-daily.tar.xz
             untar: true
             format: raw
 
-          - distro: Debian11
-            image: https://cdimage.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.tar.xz
-            untar: true
-            format: raw
-
-          - distro: Debian10
-            image: https://cloud.debian.org/images/cloud/buster/latest/debian-10-generic-amd64.tar.xz
+          - distro: Debian12
+            image: https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.tar.xz
             untar: true
             format: raw
+#
+#          - distro: Debian11
+#            image: https://cdimage.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.tar.xz
+#            untar: true
+#            format: raw
+#
+#          - distro: Debian10
+#            image: https://cloud.debian.org/images/cloud/buster/latest/debian-10-generic-amd64.tar.xz
+#            untar: true
+#            format: raw
 
     steps:
       - name: Check out repository code
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
index 3c4af72d..30d7f4d1 100644
--- a/cmake/cpack.cmake
+++ b/cmake/cpack.cmake
@@ -60,6 +60,11 @@ IF(CPACK_TYPE STREQUAL Debian12)
 	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
 ENDIF(CPACK_TYPE STREQUAL Debian12)
 
+IF(CPACK_TYPE STREQUAL Debian13)
+	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.37), libssl3 (>= 3.0.9), libpcre3 (>= 8.39)")
+	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
+ENDIF(CPACK_TYPE STREQUAL Debian13)
+
 IF(CPACK_TYPE STREQUAL Ubuntu16)
 	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.39)")
 	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c
index 95970466..0b8e2cbf 100644
--- a/drivers/ipoe/ipoe.c
+++ b/drivers/ipoe/ipoe.c
@@ -166,9 +166,14 @@ static struct genl_multicast_group ipoe_nl_mcg;
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || RHEL_MAJOR == 7
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
+#define u64_stats_fetch_begin_bh u64_stats_fetch_begin
+#define u64_stats_fetch_retry_bh u64_stats_fetch_retry
+#else
 #define u64_stats_fetch_begin_bh u64_stats_fetch_begin_irq
 #define u64_stats_fetch_retry_bh u64_stats_fetch_retry_irq
 #endif
+#endif
 
 #ifndef NETIF_F_HW_VLAN_FILTER
 #define NETIF_F_HW_VLAN_FILTER NETIF_F_HW_VLAN_CTAG_FILTER