diff --git a/aosp_slider.mk b/aosp_slider.mk
index 29351f5..9e65926 100644
--- a/aosp_slider.mk
+++ b/aosp_slider.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 $(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/device-slider.mk)
+$(call inherit-product, device/google/raviole/slider_generic.mk)
 
 PRODUCT_NAME := aosp_slider
 PRODUCT_DEVICE := slider
diff --git a/aosp_whitefin.mk b/aosp_whitefin.mk
index bcdd616..212e7a6 100644
--- a/aosp_whitefin.mk
+++ b/aosp_whitefin.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 $(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/device-whitefin.mk)
+$(call inherit-product, device/google/raviole/whitefin_generic.mk)
 
 PRODUCT_NAME := aosp_whitefin
 PRODUCT_DEVICE := whitefin
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 50c2ba7..5b13c0f 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -18,6 +18,7 @@
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
 # The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 6a9530e..f47b104 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -18,6 +18,7 @@
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
 # The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
diff --git a/slider_generic.mk b/slider_generic.mk
new file mode 100644
index 0000000..52d2542
--- /dev/null
+++ b/slider_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/raviole/device-slider.mk)
diff --git a/whitefin_generic.mk b/whitefin_generic.mk
new file mode 100644
index 0000000..a56c609
--- /dev/null
+++ b/whitefin_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/raviole/device-whitefin.mk)