diff --git a/reactos/config-arm.template.rbuild b/reactos/config-arm.template.rbuild
index 38b8d9ffd2e..e93b5fd236a 100644
--- a/reactos/config-arm.template.rbuild
+++ b/reactos/config-arm.template.rbuild
@@ -90,4 +90,10 @@
 -->
 <property name="_ELF_" value="0" />
 
+<!--
+	Whether to compile any usermode parts. This is while kernel mode is under
+	heavy development and usermode part not relevant for bootcd.
+-->
+<property name="USERMODE" value="1" />
+
 </group>
diff --git a/reactos/config-ppc.template.rbuild b/reactos/config-ppc.template.rbuild
index 0961c6402a2..ef63ef77bae 100644
--- a/reactos/config-ppc.template.rbuild
+++ b/reactos/config-ppc.template.rbuild
@@ -70,4 +70,10 @@
 -->
 <property name="_ELF_" value="0" />
 
+<!--
+	Whether to compile any usermode parts. This is while kernel mode is under
+	heavy development and usermode part not relevant for bootcd.
+-->
+<property name="USERMODE" value="1" />
+
 </group>
diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index d8a130414d9..56dc853a02e 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -97,6 +97,12 @@
 <!--
 	Whether to compile the multi processor versions for ntoskrnl and hal.
 -->
-<property name="BUILD_MP" value="1" />
+<property name="BUILD_MP" value="0" />
+
+<!--
+	Whether to compile any usermode parts. This is while kernel mode is under
+	heavy development and usermode part not relevant for bootcd.
+-->
+<property name="USERMODE" value="1" />
 
 </group>
diff --git a/reactos/tools/rbuild/backend/mingw/rules.mak b/reactos/tools/rbuild/backend/mingw/rules.mak
index ba003b0fc65..f83f84fe25d 100644
--- a/reactos/tools/rbuild/backend/mingw/rules.mak
+++ b/reactos/tools/rbuild/backend/mingw/rules.mak
@@ -263,7 +263,9 @@ ${call RBUILD_intermediate_path_noext,$(2)}_c: $(2) $(3) $$(widl_TARGET) | ${cal
 	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
-${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o}endef
+${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o}
+
+endef
 
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_SERVER_RULE
@@ -277,7 +279,9 @@ ${call RBUILD_intermediate_path_noext,$(2)}_s: $(2) $(3) $$(widl_TARGET) | ${cal
 	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
-${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o}endef
+${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call RBUILD_intermediate_path_noext,$(2)}_s.o}
+
+endef
 
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_PROXY_RULE
@@ -291,7 +295,9 @@ ${call RBUILD_intermediate_path_noext,$(2)}_p: $(2) $(3) $$(widl_TARGET) | ${cal
 	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
-${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o}endef
+${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,,${call RBUILD_intermediate_path_noext,$(2)}_p.o}
+
+endef
 
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_INTERFACE_RULE