diff --git a/.github/workflows/run_regression_tests.yaml b/.github/workflows/run_regression_tests.yaml
index e04a616c9..5e3fd9387 100644
--- a/.github/workflows/run_regression_tests.yaml
+++ b/.github/workflows/run_regression_tests.yaml
@@ -59,8 +59,7 @@ jobs:
                   '5.15.0-312.187.5.3.el9uek^UEK^9',
                   '5.4.17-2136.347.6.3.el8uek^UEK^8',
                   '4.14.35-2047.543.3.1.el7uek^UEK^7',
-                  '4.1.12-124.93.1.el7uek^UEK^7',
-                  '4.1.12-124.48.6.el6uek^UEK^6'
+                  '4.1.12-124.93.1.el7uek^UEK^7'
                  ]
     steps:
       - name: Checkout code
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index fb64e8165..37791e5cb 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -101,5 +101,4 @@ ABT_KERNELS="  \
 5.4.17-2136.347.6.3.el8uek^UEK^8-nc      \
 4.14.35-2047.543.3.1.el7uek^UEK^7-nc     \
 4.1.12-124.93.1.el7uek^UEK^7-nc          \
-4.1.12-124.48.6.el6uek^UEK^6-nc          \
 "
diff --git a/qla2x00t-32gbit/qla_os.c b/qla2x00t-32gbit/qla_os.c
index 56764e9e9..581e32492 100644
--- a/qla2x00t-32gbit/qla_os.c
+++ b/qla2x00t-32gbit/qla_os.c
@@ -3032,7 +3032,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) &&		\
 	(!defined(RHEL_RELEASE_CODE) ||				\
-	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 5))
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 4))
 	/* This may fail but that's ok */
 	pci_enable_pcie_error_reporting(pdev);
 #endif
@@ -4063,7 +4063,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) &&		\
 	(!defined(RHEL_RELEASE_CODE) ||				\
-	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 5))
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 4))
 	pci_disable_pcie_error_reporting(pdev);
 #endif
 
@@ -6966,7 +6966,7 @@ qla2x00_disable_board_on_pci_error(struct work_struct *work)
 	pci_release_selected_regions(ha->pdev, ha->bars);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) &&		\
 	(!defined(RHEL_RELEASE_CODE) ||				\
-	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 5))
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 4))
 	pci_disable_pcie_error_reporting(pdev);
 #endif
 	pci_disable_device(pdev);
diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c
index c3e2d3758..c2940f659 100644
--- a/qla2x00t/qla_os.c
+++ b/qla2x00t/qla_os.c
@@ -2395,7 +2395,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) &&		\
 	(!defined(RHEL_RELEASE_CODE) ||				\
-	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 5))
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 4))
 	/* This may fail but that's ok */
 	pci_enable_pcie_error_reporting(pdev);
 #endif
@@ -3052,7 +3052,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) &&		\
 	(!defined(RHEL_RELEASE_CODE) ||				\
-	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 5))
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 4))
 	pci_disable_pcie_error_reporting(pdev);
 #endif
 	pci_disable_device(pdev);
diff --git a/scst/include/backport.h b/scst/include/backport.h
index 0d58c05b1..83a015491 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -373,10 +373,11 @@ blkdev_issue_discard_backport(struct block_device *bdev, sector_t sector,
  * See also f2f2efb807d3 ("byteorder: Move {cpu_to_be32, be32_to_cpu}_array()
  * from Thunderbolt to core") # v4.15.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && \
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) &&	\
 	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 ||	\
-	 RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 5) && \
-	!defined(UEK_KABI_RENAME)
+	 RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 5) &&	\
+	(!defined(UEK_KABI_RENAME) ||			\
+	 LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))
 static inline void cpu_to_be32_array(__be32 *dst, const u32 *src, size_t len)
 {
 	int i;
@@ -941,7 +942,8 @@ static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags)
 	 RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 7) &&	\
 	!defined(CONFIG_SUSE_KERNEL) &&			\
 	!defined(_COMPAT_LINUX_MM_H) &&			\
-	!defined(UEK_KABI_RENAME)
+	(!defined(UEK_KABI_RENAME) ||			\
+	 LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))
 /* See also commit 1c542f38ab8d ("mm: Introduce kvcalloc()") # v4.18. */
 static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)
 {
@@ -1926,7 +1928,9 @@ static inline struct request *scsi_cmd_to_rq(struct scsi_cmnd *scmd)
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) ||		\
 	(defined(RHEL_RELEASE_CODE) &&				\
-	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(8, 7))
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(8, 7)) ||	\
+	(defined(UEK_KABI_RENAME) &&				\
+	 LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
 static inline u32 scsi_prot_ref_tag(struct scsi_cmnd *scmd)
 {
 #if defined(RHEL_MAJOR) && RHEL_MAJOR -0 == 7
@@ -2099,7 +2103,8 @@ enum {
 	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 ||		\
 	 RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 9 ||		\
 	 RHEL_MAJOR -0 == 9 && RHEL_MINOR -0 < 3) &&		\
-	!defined(UEK_KABI_RENAME)
+	(!defined(UEK_KABI_RENAME) ||				\
+	 LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
 /*
  * See also commit 64fd2ba977b1 ("scsi: scsi_transport_fc: Add an additional
  * flag to fc_host_fpin_rcv()") # v6.3
@@ -2142,7 +2147,9 @@ static inline int fc_block_rport(struct fc_rport *rport)
 /* See also commit a7dff3ad4787 ("scsi: fc: add FPIN ELS definition") # v5.2 */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) &&	\
 	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 ||	\
-	 (RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 2))
+	 (RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 2)) &&	\
+	(!defined(UEK_KABI_RENAME) ||			\
+	 LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))
 #define ELS_FPIN 0x16
 #endif
 
@@ -2150,10 +2157,11 @@ static inline int fc_block_rport(struct fc_rport *rport)
  * See also commit 62e9dd177732 ("scsi: qla2xxx: Change in PUREX to handle FPIN
  * ELS requests").
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) &&			\
-	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 ||			\
-	 (RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 4)) &&			\
-	!(defined(UEK_KABI_RENAME) && defined(FC_PORTSPEED_256GBIT))
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) &&		\
+	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 ||		\
+	 (RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 4)) &&		\
+	(!defined(UEK_KABI_RENAME) ||				\
+	 LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))
 #define ELS_RDP 0x18
 #endif