diff --git a/Makefile b/Makefile
index 8e4adeea..808ddaca 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ TARGETS += xfsprogs
 TARGETS += kernel
 TARGETS += drbd-pkg
 TARGETS += gasket-driver-pkg
+TARGETS += mellanox-ofed-pkg
 TARGETS += nvidia-open-gpu-kernel-modules-lts-pkg
 TARGETS += nvidia-open-gpu-kernel-modules-production-pkg
 TARGETS += zfs-pkg
diff --git a/Pkgfile b/Pkgfile
index 245bd39f..d1bf81ea 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -140,9 +140,9 @@ vars:
   lvm2_sha256: 4c5a6923bd1ace7ce04474608a84937ce053ba91b1ace9f0b0017268e732dc7c
   lvm2_sha512: 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff
 
-  mellanox_ofed_version: 5.9-0.5.6.0
-  mellanox_ofed_sha256: 4503258cbe92b00c734e612c3a7ad1d71e023fdffae2a2c119f7b537505e499c
-  mellanox_ofed_sha512: 58604ea89aa8351727532c48f0c59b4e533ba8bfcef9533f45d94e15ffdcf3a5c464398706cad14ebf3826b132972bd044fadbf7f047e60bdb0c2a454c96acd7
+  mellanox_ofed_version: 24.07-0.6.1.0
+  mellanox_ofed_sha256: 2d34880b9b79291cb555409c471f06c7eb4375d2f46c96384bf1f71bfaa69dcc
+  mellanox_ofed_sha512: d2cc757ec8de3fe282c5e51abda6d072810c49d2aae515b4e1039d8ebc11af468266a6eee949ded27fec1e75961b0bce5fca601e0ecaf96e0aa127915701b0e8
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.musl-libc.org/musl
   musl_version: 1.2.5
diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
index f418dbb8..ccce2ac5 100644
--- a/kernel/build/config-amd64
+++ b/kernel/build/config-amd64
@@ -1131,7 +1131,7 @@ CONFIG_UNIX_SCM=y
 CONFIG_AF_UNIX_OOB=y
 # CONFIG_UNIX_DIAG is not set
 CONFIG_TLS=m
-# CONFIG_TLS_DEVICE is not set
+CONFIG_TLS_DEVICE=y
 # CONFIG_TLS_TOE is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
@@ -1307,6 +1307,7 @@ CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=y
 CONFIG_NFT_CT=y
+# CONFIG_NFT_FLOW_OFFLOAD is not set
 # CONFIG_NFT_CONNLIMIT is not set
 CONFIG_NFT_LOG=y
 CONFIG_NFT_LIMIT=y
@@ -1332,7 +1333,9 @@ CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
 # CONFIG_NFT_FIB_NETDEV is not set
 # CONFIG_NFT_REJECT_NETDEV is not set
-# CONFIG_NF_FLOW_TABLE is not set
+# CONFIG_NF_FLOW_TABLE_INET is not set
+CONFIG_NF_FLOW_TABLE=y
+# CONFIG_NF_FLOW_TABLE_PROCFS is not set
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XTABLES_COMPAT=y
 
@@ -1753,6 +1756,7 @@ CONFIG_NET_ACT_BPF=y
 CONFIG_NET_ACT_SKBMOD=y
 CONFIG_NET_ACT_IFE=y
 CONFIG_NET_ACT_TUNNEL_KEY=y
+# CONFIG_NET_ACT_CT is not set
 # CONFIG_NET_ACT_GATE is not set
 # CONFIG_NET_IFE_SKBMARK is not set
 # CONFIG_NET_IFE_SKBPRIO is not set
@@ -1834,6 +1838,7 @@ CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
 CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
@@ -2408,7 +2413,16 @@ CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
 # CONFIG_DM_AUDIT is not set
-# CONFIG_TARGET_CORE is not set
+CONFIG_TARGET_CORE=y
+# CONFIG_TCM_IBLOCK is not set
+# CONFIG_TCM_FILEIO is not set
+# CONFIG_TCM_PSCSI is not set
+# CONFIG_TCM_USER2 is not set
+# CONFIG_LOOPBACK_TARGET is not set
+# CONFIG_TCM_FC is not set
+CONFIG_ISCSI_TARGET=y
+# CONFIG_ISCSI_TARGET_CXGB4 is not set
+# CONFIG_REMOTE_TARGET is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 # CONFIG_FUSION_FC is not set
@@ -2561,6 +2575,7 @@ CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
 CONFIG_CHELSIO_INLINE_CRYPTO=y
 CONFIG_CHELSIO_IPSEC_INLINE=m
+# CONFIG_CHELSIO_TLS_DEVICE is not set
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
@@ -2644,6 +2659,7 @@ CONFIG_MLX5_BRIDGE=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_IPOIB=y
 # CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_EN_TLS is not set
 CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLX5_SF is not set
 CONFIG_MLXSW_CORE=m
@@ -4874,7 +4890,9 @@ CONFIG_INFINIBAND_IPOIB=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 # CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_SRPT is not set
 # CONFIG_INFINIBAND_ISER is not set
+# CONFIG_INFINIBAND_ISERT is not set
 # CONFIG_INFINIBAND_RTRS_CLIENT is not set
 # CONFIG_INFINIBAND_RTRS_SERVER is not set
 # CONFIG_INFINIBAND_OPA_VNIC is not set
@@ -5093,6 +5111,7 @@ CONFIG_VHOST_TASK=y
 CONFIG_VHOST=y
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=y
+# CONFIG_VHOST_SCSI is not set
 CONFIG_VHOST_VSOCK=y
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
@@ -6048,7 +6067,7 @@ CONFIG_CRYPTO_POLY1305_X86_64=y
 # CONFIG_CRYPTO_SHA512_SSSE3 is not set
 # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
 # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
+CONFIG_CRYPTO_CRC32C_INTEL=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
 # CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
 # end of Accelerated Cryptographic Algorithms for CPU (x86)
diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
index a9d8fea6..58e6e3bd 100644
--- a/kernel/build/config-arm64
+++ b/kernel/build/config-arm64
@@ -1162,12 +1162,13 @@ CONFIG_UNIX_SCM=y
 CONFIG_AF_UNIX_OOB=y
 # CONFIG_UNIX_DIAG is not set
 CONFIG_TLS=m
-# CONFIG_TLS_DEVICE is not set
+CONFIG_TLS_DEVICE=y
 # CONFIG_TLS_TOE is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_USER=y
+# CONFIG_XFRM_USER_COMPAT is not set
 # CONFIG_XFRM_INTERFACE is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
@@ -1337,6 +1338,7 @@ CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=y
 CONFIG_NFT_CT=y
+# CONFIG_NFT_FLOW_OFFLOAD is not set
 # CONFIG_NFT_CONNLIMIT is not set
 CONFIG_NFT_LOG=y
 CONFIG_NFT_LIMIT=y
@@ -1362,7 +1364,9 @@ CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
 # CONFIG_NFT_FIB_NETDEV is not set
 # CONFIG_NFT_REJECT_NETDEV is not set
-# CONFIG_NF_FLOW_TABLE is not set
+# CONFIG_NF_FLOW_TABLE_INET is not set
+CONFIG_NF_FLOW_TABLE=y
+# CONFIG_NF_FLOW_TABLE_PROCFS is not set
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XTABLES_COMPAT=y
 
@@ -1766,6 +1770,7 @@ CONFIG_NET_ACT_BPF=y
 CONFIG_NET_ACT_SKBMOD=y
 CONFIG_NET_ACT_IFE=y
 CONFIG_NET_ACT_TUNNEL_KEY=y
+# CONFIG_NET_ACT_CT is not set
 # CONFIG_NET_ACT_GATE is not set
 # CONFIG_NET_IFE_SKBMARK is not set
 # CONFIG_NET_IFE_SKBPRIO is not set
@@ -1846,6 +1851,7 @@ CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
 CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
@@ -2669,7 +2675,16 @@ CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
 # CONFIG_DM_AUDIT is not set
-# CONFIG_TARGET_CORE is not set
+CONFIG_TARGET_CORE=y
+# CONFIG_TCM_IBLOCK is not set
+# CONFIG_TCM_FILEIO is not set
+# CONFIG_TCM_PSCSI is not set
+# CONFIG_TCM_USER2 is not set
+# CONFIG_LOOPBACK_TARGET is not set
+# CONFIG_TCM_FC is not set
+CONFIG_ISCSI_TARGET=y
+# CONFIG_ISCSI_TARGET_CXGB4 is not set
+# CONFIG_REMOTE_TARGET is not set
 # CONFIG_FUSION is not set
 
 #
@@ -2832,6 +2847,7 @@ CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
 CONFIG_CHELSIO_INLINE_CRYPTO=y
 CONFIG_CHELSIO_IPSEC_INLINE=m
+# CONFIG_CHELSIO_TLS_DEVICE is not set
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=y
 CONFIG_NET_VENDOR_CORTINA=y
@@ -2939,6 +2955,7 @@ CONFIG_MLX5_BRIDGE=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_IPOIB=y
 # CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_EN_TLS is not set
 CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLX5_SF is not set
 CONFIG_MLXSW_CORE=m
@@ -6214,7 +6231,9 @@ CONFIG_INFINIBAND_IPOIB=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 # CONFIG_INFINIBAND_SRP is not set
+# CONFIG_INFINIBAND_SRPT is not set
 # CONFIG_INFINIBAND_ISER is not set
+# CONFIG_INFINIBAND_ISERT is not set
 # CONFIG_INFINIBAND_RTRS_CLIENT is not set
 # CONFIG_INFINIBAND_RTRS_SERVER is not set
 CONFIG_EDAC_SUPPORT=y
@@ -6498,6 +6517,7 @@ CONFIG_VHOST_TASK=y
 CONFIG_VHOST=y
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=y
+# CONFIG_VHOST_SCSI is not set
 CONFIG_VHOST_VSOCK=y
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
diff --git a/mellanox-ofed/pkg.yaml b/mellanox-ofed/pkg.yaml
index a925e495..28a49809 100644
--- a/mellanox-ofed/pkg.yaml
+++ b/mellanox-ofed/pkg.yaml
@@ -1,5 +1,5 @@
 name: mellanox-ofed-pkg
-variant: scratch
+variant: alpine
 shell: /toolchain/bin/bash
 dependencies:
   - stage: kernel-build
@@ -13,29 +13,27 @@ steps:
       ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
     prepare:
       - |
-        tar -xzf mellanox_ofed.tgz --strip-components=1
+        rm /bin/mktemp
+        ln -s /toolchain/bin/mktemp /bin/
 
+        tar -xzf mellanox_ofed.tgz --strip-components=1
         cd SOURCES
-        tar xf mlnx-ofed-kernel_5.9.orig.tar.gz
+        tar xf mlnx-ofed-kernel_*
     build:
       - |
-        cd SOURCES/mlnx-ofed-kernel-5.9
+        cd SOURCES/mlnx-ofed-kernel-*
 
-        ./configure --with-core-mod \
-          --with-user_mad-mod \
-          --with-user_access-mod \
-          --with-addr_trans-mod \
-          --with-mlx5-mod \
-          --with-ipoib-mod \
-          --with-srp-mod \
-          --with-iser-mod \
+        ./configure --all \
+          --without-core-mod \
+          --without-nvmf_host-mod \
+          --without-nvmf_target-mod \
           --kernel-sources=/src \
           -j $(nproc)
 
         make kernel -j $(nproc)
     install:
       - |
-        cd SOURCES/mlnx-ofed-kernel-5.9
+        cd SOURCES/mlnx-ofed-kernel-*
 
         mkdir -p /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
         cp /src/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/