diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
index acb7f85a82..4d23e37143 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
@@ -143,8 +143,8 @@ CONFIG_X86_INTEL_TSX_MODE_ON=y
 # CONFIG_X86_MPPARSE is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_X2APIC=y
 CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.15
index 65b2052e56..c1a6f3439c 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.15
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.15
@@ -13,6 +13,8 @@ CONFIG_ARCH_ZYNQMP=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_VA_BITS_48=y
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCMGENET=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMPAT=y
@@ -36,6 +38,7 @@ CONFIG_GPIO_XGENE_SB=y
 CONFIG_KVM=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_MAILBOX=y
+CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_OCTEON=y
@@ -97,6 +100,3 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_XGENE_DMA=y
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCMGENET=m
-CONFIG_MDIO_BCM_UNIMAC=m
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15
index 2c801b6aea..caf37737a8 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15
@@ -192,9 +192,9 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRONTSWAP=y
-CONFIG_FS_ENCRYPTION=y
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
+CONFIG_FS_ENCRYPTION=y
 CONFIG_FUSE_FS=m
 CONFIG_FUSION=y
 CONFIG_FUSION_CTL=m
@@ -277,8 +277,8 @@ CONFIG_INPUT_MOUSEDEV=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m