diff --git a/config/acid.toml b/config/acid.toml
index 01670c60..5392934f 100644
--- a/config/acid.toml
+++ b/config/acid.toml
@@ -1,6 +1,6 @@
 # Configuration for "acid" testing
 
-include = ["net.toml"]
+include = ["base.toml"]
 
 # General settings
 [general]
diff --git a/config/auto-test.toml b/config/auto-test.toml
index a18ab8cb..b6ff9786 100644
--- a/config/auto-test.toml
+++ b/config/auto-test.toml
@@ -1,7 +1,7 @@
 # Configuration for automated testing of essential test suites
 # Smaller test suites are executed first to catch possible bugs or regressions faster
 
-include = ["net.toml"]
+include = ["base.toml"]
 
 # General settings
 [general]
diff --git a/config/base.toml b/config/base.toml
index 661abdc2..cdb134c1 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -15,6 +15,8 @@ bootloader = {}
 kernel = {}
 libgcc = {}
 libstdcxx = {}
+netdb = {}
+netutils = {}
 relibc = {}
 userutils = {}
 uutils = {}
@@ -39,6 +41,15 @@ requires_weak 00_base
 pcid-spawner
 """
 
+## Network init
+[[files]]
+path = "/usr/lib/init.d/10_net"
+data = """
+requires_weak 00_drivers
+notify smolnetd
+nowait dhcpd
+"""
+
 [[files]]
 path = "/etc/login_schemes.toml"
 data = """
@@ -87,6 +98,31 @@ schemes = [
 path = "/etc/hostname"
 data = "redox"
 
+## Default net configuration (optimized for QEMU)
+[[files]]
+path = "/etc/net/dns"
+data = """
+9.9.9.9
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
 # https://www.freedesktop.org/software/systemd/man/latest/os-release.html
 [[files]]
 path = "/usr/lib/os-release"
diff --git a/config/minimal-net.toml b/config/minimal-net.toml
index 2696d0bb..f71af309 100644
--- a/config/minimal-net.toml
+++ b/config/minimal-net.toml
@@ -1,6 +1,6 @@
 # Minimal network configuration
 
-include = ["net.toml"]
+include = ["base.toml"]
 
 # General settings
 [general]
@@ -14,7 +14,6 @@ coreutils = {}
 extrautils = {}
 findutils = {}
 ion = {}
-netdb = {}
 pkgutils = {}
 kibi = {}
 
@@ -24,6 +23,6 @@ data = """
 requires_weak 10_net
 inputd -A 2
 nowait getty 2
-nowait getty /scheme/debug -J
+nowait getty /scheme/debug/no-preserve -J
 """
 
diff --git a/config/minimal.toml b/config/minimal.toml
index 93556938..ae24a6fd 100644
--- a/config/minimal.toml
+++ b/config/minimal.toml
@@ -17,7 +17,7 @@ kibi = {}
 [[files]]
 path = "/usr/lib/init.d/30_console"
 data = """
-requires_weak 00_drivers
+requires_weak 10_net
 inputd -A 2
 nowait getty 2
 nowait getty /scheme/debug/no-preserve -J
diff --git a/config/net.toml b/config/net.toml
deleted file mode 100644
index 5dc2d979..00000000
--- a/config/net.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Network configuration: includes the base configuration and adds files required
-# for networking
-
-include = ["base.toml"]
-
-# Package settings
-[packages]
-netdb = {}
-netutils = {}
-
-## Network init
-[[files]]
-path = "/usr/lib/init.d/10_net"
-data = """
-requires_weak 00_drivers
-notify smolnetd
-nowait dhcpd
-"""
-
-## Default net configuration (optimized for QEMU)
-[[files]]
-path = "/etc/net/dns"
-data = """
-9.9.9.9
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
diff --git a/config/redoxer.toml b/config/redoxer.toml
index 83636f28..6532300d 100644
--- a/config/redoxer.toml
+++ b/config/redoxer.toml
@@ -1,6 +1,6 @@
 # Configuration for the Redoxer image
 
-include = ["net.toml"]
+include = ["base.toml"]
 
 # Package settings
 [packages]
@@ -11,7 +11,6 @@ extrautils = {}
 findutils = {}
 gnu-make = {}
 ion = {}
-netdb = {}
 pkgutils = {}
 relibc = {}
 sed = {}
diff --git a/config/server.toml b/config/server.toml
index 3c7df611..53b30cbb 100644
--- a/config/server.toml
+++ b/config/server.toml
@@ -1,6 +1,6 @@
 # Server configuration
 
-include = ["net.toml"]
+include = ["base.toml"]
 
 # General settings
 [general]