diff --git a/configs/fedora/generic/riscv/CONFIG_TCM_USER2 b/configs/fedora/generic/riscv/CONFIG_TCM_USER2
index 751dc68f7..df07ef1d4 100644
--- a/configs/fedora/generic/riscv/CONFIG_TCM_USER2
+++ b/configs/fedora/generic/riscv/CONFIG_TCM_USER2
@@ -1 +1 @@
-CONFIG_TCM_USER2=y
+CONFIG_TCM_USER2=m
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index 56416cd9f..1339b26f6 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -5192,7 +5192,7 @@ CONFIG_TCM_IBLOCK=y
 CONFIG_TCM_PSCSI=y
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_TCM_QLA2XXX=m
-CONFIG_TCM_USER2=y
+CONFIG_TCM_USER2=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BBR=m
 CONFIG_TCP_CONG_BIC=m
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index 0a7d58f8a..e73ec3f33 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -5169,7 +5169,7 @@ CONFIG_TCM_IBLOCK=y
 CONFIG_TCM_PSCSI=y
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_TCM_QLA2XXX=m
-CONFIG_TCM_USER2=y
+CONFIG_TCM_USER2=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BBR=m
 CONFIG_TCP_CONG_BIC=m