diff --git a/packages/kernel-6.18/check-fips-modules.drop-in.conf.in b/packages/kernel-6.18/check-fips-modules.drop-in.conf.in
new file mode 100644
index 00000000..c5585479
--- /dev/null
+++ b/packages/kernel-6.18/check-fips-modules.drop-in.conf.in
@@ -0,0 +1,3 @@
+[Unit]
+Requires=fips-modprobe@__FIPS_MODULE__.service
+After=fips-modprobe@__FIPS_MODULE__.service
diff --git a/packages/kernel-6.18/fipsmodules-aarch64 b/packages/kernel-6.18/fipsmodules-aarch64
new file mode 100644
index 00000000..df45c2c4
--- /dev/null
+++ b/packages/kernel-6.18/fipsmodules-aarch64
@@ -0,0 +1,41 @@
+sha1
+sha224
+sha256
+sha384
+sha512
+sha3-224
+sha3-256
+sha3-384
+sha3-512
+crc32c
+ghash
+xxhash64
+ghash-ce
+sha3-ce
+cipher_null
+des3_ede
+aes
+dh
+ecdh
+aes-arm64
+aes-ce-blk
+aes-ce-ccm
+aes-ce-cipher
+aes-neon-blk
+aes-neon-bs
+ecb
+cbc
+ctr
+xts
+gcm
+ccm
+authenc
+hmac
+cmac
+cts
+lzo
+essiv
+seqiv
+tcrypt
+crypto_user
+rsa
diff --git a/packages/kernel-6.18/fipsmodules-x86_64 b/packages/kernel-6.18/fipsmodules-x86_64
new file mode 100644
index 00000000..f85d5ecf
--- /dev/null
+++ b/packages/kernel-6.18/fipsmodules-x86_64
@@ -0,0 +1,34 @@
+sha1
+sha224
+sha256
+sha384
+sha512
+sha3-224
+sha3-256
+sha3-384
+sha3-512
+crc32c
+ghash
+xxhash64
+ghash_clmulni_intel
+cipher_null
+des3_ede
+aes
+dh
+ecdh
+ecb
+cbc
+ctr
+xts
+gcm
+ccm
+authenc
+hmac
+cmac
+cts
+lzo
+essiv
+seqiv
+tcrypt
+crypto_user
+rsa
diff --git a/packages/kernel-6.18/kernel-6.18.spec b/packages/kernel-6.18/kernel-6.18.spec
index 36cc483b..7b6a9d00 100644
--- a/packages/kernel-6.18/kernel-6.18.spec
+++ b/packages/kernel-6.18/kernel-6.18.spec
@@ -27,6 +27,12 @@ Source111: config-full-bottlerocket-aarch64-on-aarch64
 Source112: config-full-bottlerocket-x86_64-on-x86_64
 Source113: config-full-bottlerocket-aarch64-on-x86_64
 
+# This list of FIPS modules is extracted from /etc/fipsmodules in the initramfs
+# after placing AL2023 in FIPS mode.
+Source200: check-fips-modules.drop-in.conf.in
+Source201: fipsmodules-x86_64
+Source202: fipsmodules-aarch64
+
 # Adjust kernel-devel mount behavior if not squashfs.
 Source210: var-lib-kernel-devel-lower.mount.drop-in.conf.in
 
@@ -103,9 +109,6 @@ Conflicts: %{_cross_os}image-feature(external-kmod-development)
 # Legacy iptables support is not enabled in this kernel.
 Conflicts: %{_cross_os}iptables-legacy
 
-# FIPS certification is not yet available for this kernel.
-Conflicts: %{_cross_os}image-feature(fips)
-
 # Pull in expected modules.
 Requires: %{name}-modules = %{version}-%{release}
 
@@ -123,6 +126,9 @@ Requires: (%{name}-modules-neuron if (%{_cross_os}variant-platform(aws) without
 
 Requires: %{_cross_os}kmod-6.18-efa
 
+# Pull in FIPS-related files if needed.
+Requires: (%{name}-fips if %{_cross_os}image-feature(fips))
+
 %global _cross_ksrcdir %{_cross_usrsrc}/kernels/%{version}
 %global _cross_kmoddir %{_cross_libdir}/modules/%{version}
 
@@ -165,6 +171,14 @@ Summary: Header files for the Linux kernel for use by glibc
 %description headers
 %{summary}.
 
+%package fips
+Summary: FIPS related configuration for the Linux kernel
+Requires: (%{_cross_os}image-feature(fips) and %{name})
+Conflicts: %{_cross_os}image-feature(no-fips)
+
+%description fips
+%{summary}.
+
 %if "%{_cross_arch}" == "x86_64"
 %package modules-neuron
 Summary: Modules for the Linux kernel with Neuron hardware
@@ -475,6 +489,20 @@ ln -rs %{buildroot}%{_cross_kmoddir} %{buildroot}%{_cross_libdir}/modules/%{kmaj
 # Install a copy of System.map so that module dependencies can be regenerated.
 install -p -m 0600 System.map %{buildroot}%{_cross_kmoddir}
 
+# Ensure that each required FIPS module is loaded as a dependency of the
+# check-fips-module.service. The list of FIPS modules is different across
+# kernels but the check is consistent: it loads the "tcrypt" module after
+# the other modules are loaded.
+mkdir -p %{buildroot}%{_cross_unitdir}/check-fips-modules.service.d
+i=0
+for fipsmod in $(cat %{_sourcedir}/fipsmodules-%{_cross_arch}) ; do
+  [ "${fipsmod}" == "tcrypt" ] && continue
+  drop_in="$(printf "%03d\n" "${i}")-${fipsmod}.conf"
+  sed -e "s|__FIPS_MODULE__|${fipsmod}|g" %{S:200} \
+    > %{buildroot}%{_cross_unitdir}/check-fips-modules.service.d/"${drop_in}"
+  (( i+=1 ))
+done
+
 # Create the mount point for the runtime kernel-devel directory, and populate
 # with the linker script that driverdog needs.
 install -d %{buildroot}%{_cross_datadir}/bottlerocket/kernel-devel/%{version}/scripts
@@ -569,6 +597,9 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/build
 %attr(775, root, builder) %{_cross_ksrcdir}/scripts/*
 
+%files fips
+%{_cross_unitdir}/check-fips-modules.service.d/*.conf
+
 %files bootconfig-aws
 %{_cross_bootconfigdir}/05-aws.conf
 
@@ -652,10 +683,10 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/crypto/cast5_generic.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/cast6_generic.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/cast_common.%{_ko}
-%{_cross_kmoddir}/kernel/crypto/chacha.%{_ko}
-%{_cross_kmoddir}/kernel/crypto/chacha20poly1305.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/cbc.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/ccm.%{_ko}
+%{_cross_kmoddir}/kernel/crypto/chacha.%{_ko}
+%{_cross_kmoddir}/kernel/crypto/chacha20poly1305.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/cmac.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/crc32-cryptoapi.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/crypto_user.%{_ko}
@@ -677,10 +708,10 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/crypto/rmd160.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/seed.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/serpent_generic.%{_ko}
+%{_cross_kmoddir}/kernel/crypto/tcrypt.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/tea.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/twofish_common.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/twofish_generic.%{_ko}
-%{_cross_kmoddir}/kernel/crypto/tcrypt.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/wp512.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/xcbc.%{_ko}
 %{_cross_kmoddir}/kernel/crypto/xor.%{_ko}
@@ -771,33 +802,32 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/drm.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/drm_shmem_helper.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/drm_suballoc_helper.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/gpu/drm/drm_ttm_helper.%{_ko}
+
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/clients/drm_client_lib.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/sysfb/drm_sysfb_helper.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/gpu/drm/sysfb/simpledrm.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/display/drm_display_helper.%{_ko}
 
-%{_cross_kmoddir}/kernel/drivers/gpu/drm/sysfb/simpledrm.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/gpu/drm/drm_ttm_helper.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/ttm/ttm.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/drivers/gpu/drm/vmwgfx/vmwgfx.%{_ko}
 %endif
 
 %{_cross_kmoddir}/kernel/drivers/hid/hid-generic.%{_ko}
-%if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/drivers/hid/hid-hyperv.%{_ko}
-%endif
 %{_cross_kmoddir}/kernel/drivers/hid/hid-multitouch.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/hid/uhid.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/hid/usbhid/usbhid.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/hwmon/acpi_power_meter.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/drivers/hwmon/coretemp.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/hwmon/k10temp.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/hid/hid-hyperv.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/hv/hv_balloon.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/hv/hv_utils.%{_ko}
 %endif
+%{_cross_kmoddir}/kernel/drivers/hwmon/acpi_power_meter.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/hwmon/hwmon.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/drivers/hv/hv_balloon.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/hv/hv_utils.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/hwmon/coretemp.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/hwmon/k10temp.%{_ko}
 %endif
 %{_cross_kmoddir}/kernel/drivers/i2c/algos/i2c-algo-bit.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
@@ -887,8 +917,8 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/i40e/i40e.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/igb/igb.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/igc/igc.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ice/ice.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ice/ice.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/mellanox/mlxfw/mlxfw.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ethernet/realtek/r8169.%{_ko}
@@ -912,11 +942,7 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/drivers/net/netdevsim/netdevsim.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/net_failover.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/nlmon.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/phy/fixed_phy.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/phy/libphy.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/phy/mdio-bus.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/phy/mdio_devres.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/phy/realtek/realtek.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ppp/bsd_comp.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_async.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_deflate.%{_ko}
@@ -926,6 +952,10 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/drivers/net/ppp/pppoe.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/ppp/pppox.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/slip/slhc.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/net/phy/fixed_phy.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/net/phy/libphy.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/net/phy/mdio_devres.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/net/phy/realtek/realtek.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/tap.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/team/team.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/team/team_mode_activebackup.%{_ko}
@@ -944,12 +974,10 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %endif
 %{_cross_kmoddir}/kernel/drivers/nvme/host/nvme-fabrics.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/nvme/host/nvme-tcp.%{_ko}
-%if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/drivers/pci/controller/pci-hyperv-intf.%{_ko}
-%endif
 %{_cross_kmoddir}/kernel/drivers/pci/hotplug/acpiphp_ibm.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/pci/pci-stub.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
+%{_cross_kmoddir}/kernel/drivers/pci/controller/pci-hyperv-intf.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/pci/hotplug/cpcihp_generic.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/platform/x86/wmi-bmof.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/platform/x86/wmi.%{_ko}
@@ -977,12 +1005,12 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %endif
 %{_cross_kmoddir}/kernel/drivers/tty/serial/8250/8250_exar.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/uio/uio_dmem_genirq.%{_ko}
-%if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/drivers/uio/uio_hv_generic.%{_ko}
-%endif
 %{_cross_kmoddir}/kernel/drivers/uio/uio.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/uio/uio_pci_generic.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/uio/uio_pdrv_genirq.%{_ko}
+%if "%{_cross_arch}" == "x86_64"
+%{_cross_kmoddir}/kernel/drivers/uio/uio_hv_generic.%{_ko}
+%endif
 %{_cross_kmoddir}/kernel/drivers/usb/class/cdc-acm.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/usb/common/usb-common.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/usb/core/usbcore.%{_ko}
@@ -1042,9 +1070,6 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %endif
 
 %{_cross_kmoddir}/kernel/drivers/scsi/scsi_transport_sas.%{_ko}
-%if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/drivers/scsi/hv_storvsc.%{_ko}
-%endif
 %{_cross_kmoddir}/kernel/drivers/scsi/iscsi_boot_sysfs.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/scsi/iscsi_tcp.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/scsi/libiscsi.%{_ko}
@@ -1056,6 +1081,7 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/drivers/target/loopback/tcm_loop.%{_ko}
 
 %if "%{_cross_arch}" == "x86_64"
+%{_cross_kmoddir}/kernel/drivers/scsi/hv_storvsc.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/scsi/vmw_pvscsi.%{_ko}
 %endif
 
@@ -1189,6 +1215,10 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/bridge/bridge.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/br_netfilter.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_802_3.%{_ko}
+%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtable_broute.%{_ko}
+%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtable_filter.%{_ko}
+%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtable_nat.%{_ko}
+%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtables.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_among.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_arp.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_arpreply.%{_ko}
@@ -1205,10 +1235,6 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_snat.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_stp.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebt_vlan.%{_ko}
-%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtable_broute.%{_ko}
-%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtable_filter.%{_ko}
-%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtable_nat.%{_ko}
-%{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtables.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/nft_reject_bridge.%{_ko}
 %{_cross_kmoddir}/kernel/net/ceph/libceph.%{_ko}
 %{_cross_kmoddir}/kernel/net/core/failover.%{_ko}
@@ -1229,13 +1255,14 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/ipv4/ipcomp.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/ipip.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/arp_tables.%{_ko}
-%{_cross_kmoddir}/kernel/net/ipv4/netfilter/arptable_filter.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/arpt_mangle.%{_ko}
+%{_cross_kmoddir}/kernel/net/ipv4/netfilter/arptable_filter.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_ah.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_ECN.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_REJECT.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_rpfilter.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_SYNPROXY.%{_ko}
+%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_nat.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/nf_defrag_ipv4.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/nf_dup_ipv4.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/nf_nat_h323.%{_ko}
@@ -1247,7 +1274,6 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/nft_dup_ipv4.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/nft_fib_ipv4.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/netfilter/nft_reject_ipv4.%{_ko}
-%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_nat.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/raw_diag.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/tcp_bbr.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv4/tcp_bic.%{_ko}
@@ -1289,6 +1315,8 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_rt.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_srh.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_SYNPROXY.%{_ko}
+%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_nat.%{_ko}
+%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_security.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/nf_defrag_ipv6.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/nf_dup_ipv6.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/nf_reject_ipv6.%{_ko}
@@ -1297,8 +1325,6 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/nft_dup_ipv6.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/nft_fib_ipv6.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/netfilter/nft_reject_ipv6.%{_ko}
-%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_nat.%{_ko}
-%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_security.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/sit.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/tunnel6.%{_ko}
 %{_cross_kmoddir}/kernel/net/ipv6/xfrm6_tunnel.%{_ko}
@@ -1471,9 +1497,9 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/netfilter/xt_TCPMSS.%{_ko}
 %{_cross_kmoddir}/kernel/net/netfilter/xt_TCPOPTSTRIP.%{_ko}
 %{_cross_kmoddir}/kernel/net/netfilter/xt_TEE.%{_ko}
-%{_cross_kmoddir}/kernel/net/netfilter/xt_TRACE.%{_ko}
 %{_cross_kmoddir}/kernel/net/netfilter/xt_time.%{_ko}
 %{_cross_kmoddir}/kernel/net/netfilter/xt_TPROXY.%{_ko}
+%{_cross_kmoddir}/kernel/net/netfilter/xt_TRACE.%{_ko}
 %{_cross_kmoddir}/kernel/net/netfilter/xt_u32.%{_ko}
 %{_cross_kmoddir}/kernel/net/netlink/netlink_diag.%{_ko}
 %{_cross_kmoddir}/kernel/net/nsh/nsh.%{_ko}
@@ -1540,15 +1566,13 @@ install -p -m 0644 %{S:222} %{S:224} %{buildroot}%{_cross_unitdir}
 %{_cross_kmoddir}/kernel/net/sunrpc/sunrpc.%{_ko}
 %{_cross_kmoddir}/kernel/net/tls/tls.%{_ko}
 %{_cross_kmoddir}/kernel/net/unix/unix_diag.%{_ko}
-%if "%{_cross_arch}" == "x86_64"
-%{_cross_kmoddir}/kernel/net/vmw_vsock/hv_sock.%{_ko}
-%endif
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vmw_vsock_virtio_transport.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vsock_diag.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vsock.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vsock_loopback.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
+%{_cross_kmoddir}/kernel/net/vmw_vsock/hv_sock.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.%{_ko}
 %endif
 %{_cross_kmoddir}/kernel/net/xfrm/xfrm_algo.%{_ko}