diff --git a/config/server.toml b/config/server.toml
index 5e985216e..ff0e7cf21 100644
--- a/config/server.toml
+++ b/config/server.toml
@@ -32,3 +32,9 @@ inputd -A 2
 nowait getty 2
 nowait getty /scheme/debug/no-preserve -J
 """
+[[files]]
+path = "/etc/login_config.toml"
+data = """
+[user_schemes.user]
+schemes = ["memory","sudo","sys","file","rand","null","ip","icmp","tcp","udp","thisproc","pty","orbital","display.vesa","uds_stream","uds_dgram","pipe","time","event"]
+"""
diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
index cc9e1bbf5..bcdc1779b 100644
--- a/recipes/core/base-initfs/recipe.toml
+++ b/recipes/core/base-initfs/recipe.toml
@@ -8,6 +8,7 @@ dependencies = [
 ]
 script = """
 BINS=(
+    namespace
     init
     logd
     ramfs
@@ -89,7 +90,7 @@ mkdir -pv "${COOKBOOK_BUILD}/initfs/bin" "${COOKBOOK_BUILD}/initfs/lib/drivers"
 for bin in "${BINS[@]}"
 do
     case "${bin}" in
-      init | logd | ramfs | randd | zerod | pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd | hwd)
+      namespace | init | logd | ramfs | randd | zerod | pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd | hwd)
         cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_BUILD}/initfs/bin"
         ;;
       *)
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index 2afacf3a0..5aa546992 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -1,11 +1,12 @@
 [source]
-git = "https://gitlab.redox-os.org/redox-os/base.git"
+git = "https://gitlab.redox-os.org/Ibuki.O/base.git"
+branch = "namespace-improvement"
 
 [build]
 template = "custom"
 script = """
 mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
-for package in audiod ipcd ptyd; do
+for package in audiod ipcd ptyd; do 
     "${COOKBOOK_CARGO}" build \
         --manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \
         ${build_flags}
diff --git a/recipes/core/kernel/recipe.toml b/recipes/core/kernel/recipe.toml
index 38b66b43f..fa17b1a0a 100644
--- a/recipes/core/kernel/recipe.toml
+++ b/recipes/core/kernel/recipe.toml
@@ -1,5 +1,6 @@
 [source]
-git = "https://gitlab.redox-os.org/redox-os/kernel.git"
+git = "https://gitlab.redox-os.org/Ibuki.O/kernel.git"
+branch = "namespace-improvement"
 
 [build]
 template = "custom"
diff --git a/recipes/core/redoxfs/recipe.toml b/recipes/core/redoxfs/recipe.toml
index c6609e329..d613cae22 100644
--- a/recipes/core/redoxfs/recipe.toml
+++ b/recipes/core/redoxfs/recipe.toml
@@ -1,5 +1,6 @@
 [source]
-git = "https://gitlab.redox-os.org/redox-os/redoxfs.git"
+git = "https://gitlab.redox-os.org/Ibuki.O/redoxfs.git"
+branch = "unlinkat"
 
 [build]
 template = "custom"
diff --git a/recipes/core/relibc/recipe.toml b/recipes/core/relibc/recipe.toml
index ccc26a5d0..7bdf241a9 100644
--- a/recipes/core/relibc/recipe.toml
+++ b/recipes/core/relibc/recipe.toml
@@ -1,5 +1,6 @@
 [source]
-git = "https://gitlab.redox-os.org/redox-os/relibc.git"
+git = "https://gitlab.redox-os.org/Ibuki.O/relibc.git"
+branch = "namespace-improvement"
 
 [build]
 template = "custom"
diff --git a/recipes/core/userutils/recipe.toml b/recipes/core/userutils/recipe.toml
index 666bfeb10..ce71098ee 100644
--- a/recipes/core/userutils/recipe.toml
+++ b/recipes/core/userutils/recipe.toml
@@ -1,5 +1,6 @@
 [source]
-git = "https://gitlab.redox-os.org/redox-os/userutils.git"
+git = "https://gitlab.redox-os.org/Ibuki.O/userutils.git"
+branch = "namespace-improvement"
 
 [build]
 template = "custom"