diff --git a/configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR b/configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR
new file mode 100644
index 000000000..0a7ea27a4
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_SHUFFLE_PAGE_ALLOCATOR
@@ -0,0 +1 @@
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
diff --git a/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED b/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED
new file mode 100644
index 000000000..630a3ed81
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_HARDENED
@@ -0,0 +1 @@
+# CONFIG_SLAB_FREELIST_HARDENED is not set
diff --git a/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_RANDOM b/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_RANDOM
new file mode 100644
index 000000000..c0773212e
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_SLAB_FREELIST_RANDOM
@@ -0,0 +1 @@
+# CONFIG_SLAB_FREELIST_RANDOM is not set
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index 59eacb2e7..3deaf42d5 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -4712,7 +4712,7 @@ CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 # CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
 # CONFIG_SI7005 is not set
@@ -4729,8 +4729,8 @@ CONFIG_SKGE_GENESIS=y
 CONFIG_SKGE=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SKY2=m
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLIMBUS is not set
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index b7d3d2b38..688bbd598 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -4690,7 +4690,7 @@ CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 # CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
 # CONFIG_SI7005 is not set
@@ -4707,8 +4707,8 @@ CONFIG_SKGE_GENESIS=y
 CONFIG_SKGE=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SKY2=m
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLIMBUS is not set