diff --git a/repos/base-hw/src/test/cpu_quota/sync/main.cc b/repos/base-hw/src/test/cpu_quota/sync/main.cc
index 911d3b4a33..ae0417d1dd 100644
--- a/repos/base-hw/src/test/cpu_quota/sync/main.cc
+++ b/repos/base-hw/src/test/cpu_quota/sync/main.cc
@@ -146,7 +146,7 @@ namespace Server
 
 	char const *name() { return "sync_ep"; }
 
-	size_t stack_size() { return 2 * 1024 * sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint & ep) { static Main main(ep); }
 }
diff --git a/repos/base-nova/src/test/platform/main.cc b/repos/base-nova/src/test/platform/main.cc
index a23684bba0..a7dae58319 100644
--- a/repos/base-nova/src/test/platform/main.cc
+++ b/repos/base-nova/src/test/platform/main.cc
@@ -16,6 +16,7 @@
 #include <base/thread.h>
 #include <base/log.h>
 #include <base/snprintf.h>
+#include <base/component.h>
 
 #include <util/touch.h>
 #include <util/retry.h>
@@ -728,11 +729,4 @@ Main::Main(Env &env) : env(env)
 }
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-	Genode::size_t stack_size()      { return 2*1024*sizeof(long);  }
-	void construct(Genode::Env &env) { static Main main(env); }
-}
+void Component::construct(Genode::Env &env) { static Main main(env); }
diff --git a/repos/base/src/test/affinity/main.cc b/repos/base/src/test/affinity/main.cc
index b0d8905dc2..52f4c3adf8 100644
--- a/repos/base/src/test/affinity/main.cc
+++ b/repos/base/src/test/affinity/main.cc
@@ -143,5 +143,4 @@ Main::Main(Genode::Env &env) : env(env)
 	}
 }
 
-Genode::size_t Component::stack_size()      { return 8*1024*sizeof(long); }
 void Component::construct(Genode::Env &env) { static Main inst(env); }
diff --git a/repos/base/src/test/thread/main.cc b/repos/base/src/test/thread/main.cc
index f110e93d5d..c6abedcc34 100644
--- a/repos/base/src/test/thread/main.cc
+++ b/repos/base/src/test/thread/main.cc
@@ -333,9 +333,6 @@ static void test_create_as_many_threads(Env &env)
 }
 
 
-size_t Component::stack_size() { return 16*1024*sizeof(long); }
-
-
 void Component::construct(Env &env)
 {
 	log("--- thread test started ---");
diff --git a/repos/dde_bsd/src/drivers/audio/main.cc b/repos/dde_bsd/src/drivers/audio/main.cc
index 9a553c3a2b..6e513cd353 100644
--- a/repos/dde_bsd/src/drivers/audio/main.cc
+++ b/repos/dde_bsd/src/drivers/audio/main.cc
@@ -537,8 +537,4 @@ struct Main
  ** Component **
  ***************/
 
-namespace Component {
-	char const *name()               { return "audio_drv_ep";      }
-	size_t      stack_size()         { return 8*1024*sizeof(long); }
-	void construct(Genode::Env &env) { static Main server(env);    }
-}
+void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/dde_ipxe/src/drivers/nic/main.cc b/repos/dde_ipxe/src/drivers/nic/main.cc
index 94bab9ff35..5576490314 100644
--- a/repos/dde_ipxe/src/drivers/nic/main.cc
+++ b/repos/dde_ipxe/src/drivers/nic/main.cc
@@ -159,7 +159,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "nic_drv_ep";        }
-	size_t      stack_size()       { return 2*1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);     }
+	char const *name()             { return "nic_drv_ep";         }
+	size_t      stack_size()       { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/main.cc b/repos/dde_linux/src/drivers/framebuffer/intel/main.cc
index 915592aa3c..f5f123ad4c 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/main.cc
+++ b/repos/dde_linux/src/drivers/framebuffer/intel/main.cc
@@ -108,9 +108,4 @@ static void run_linux(void * m)
 }
 
 
-Genode::size_t Component::stack_size() {
-	return 8*1024*sizeof(long); }
-
-
-void Component::construct(Genode::Env &env) {
-	static Main m(env); }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/dde_linux/src/drivers/usb/main.cc b/repos/dde_linux/src/drivers/usb/main.cc
index abd8cb643d..89b9895270 100644
--- a/repos/dde_linux/src/drivers/usb/main.cc
+++ b/repos/dde_linux/src/drivers/usb/main.cc
@@ -16,8 +16,4 @@
 extern void start_usb_driver(Genode::Env &env);
 
 
-Genode::size_t Component::stack_size() {
-	return 4*1024*sizeof(long); }
-
-
 void Component::construct(Genode::Env &env) { start_usb_driver(env); }
diff --git a/repos/dde_linux/src/drivers/wifi/main.cc b/repos/dde_linux/src/drivers/wifi/main.cc
index 507aafefbf..589bdf5ca6 100644
--- a/repos/dde_linux/src/drivers/wifi/main.cc
+++ b/repos/dde_linux/src/drivers/wifi/main.cc
@@ -254,7 +254,4 @@ struct Main
 };
 
 
-namespace Component {
-	Genode::size_t      stack_size() { return 32 * 1024 * sizeof(long); }
-	void construct(Genode::Env &env) { static Main server(env);         }
-}
+void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/dde_linux/src/server/usb_terminal/main.cc b/repos/dde_linux/src/server/usb_terminal/main.cc
index 9093d27284..85b2061d45 100644
--- a/repos/dde_linux/src/server/usb_terminal/main.cc
+++ b/repos/dde_linux/src/server/usb_terminal/main.cc
@@ -317,7 +317,7 @@ struct Terminal::Main
 
 namespace Server {
 	char const *name()       { return "usb_terminal_ep"; };
-	size_t      stack_size() { return 2*1024*sizeof(long); }
+	size_t      stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/dde_linux/src/test/framebuffer/intel/main.cc b/repos/dde_linux/src/test/framebuffer/intel/main.cc
index 93aa79b18b..cacffef0de 100644
--- a/repos/dde_linux/src/test/framebuffer/intel/main.cc
+++ b/repos/dde_linux/src/test/framebuffer/intel/main.cc
@@ -120,7 +120,3 @@ void Component::construct(Genode::Env &env)
 	log("--- Framebuffer controller ---\n");
 	static Framebuffer_controller controller(env);
 }
-
-
-size_t Component::stack_size() {
-	return 4*1024*sizeof(long); }
diff --git a/repos/dde_rump/src/server/rump_cgd/main.cc b/repos/dde_rump/src/server/rump_cgd/main.cc
index acc99b1f08..171d28952b 100644
--- a/repos/dde_rump/src/server/rump_cgd/main.cc
+++ b/repos/dde_rump/src/server/rump_cgd/main.cc
@@ -48,5 +48,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 4 * 1024 * sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main inst(env);          }
+void Component::construct(Genode::Env &env) { static Main inst(env); }
diff --git a/repos/dde_rump/src/server/rump_fs/main.cc b/repos/dde_rump/src/server/rump_fs/main.cc
index fef4519acc..994cd8897b 100644
--- a/repos/dde_rump/src/server/rump_fs/main.cc
+++ b/repos/dde_rump/src/server/rump_fs/main.cc
@@ -514,12 +514,4 @@ struct File_system::Main
 };
 
 
-/**********************
- ** Component framework **
- **********************/
-
-namespace Component {
-	     Genode::size_t stack_size() { return 4 * 1024 * sizeof(long);     }
-	void construct(Genode::Env &env) { static File_system::Main inst(env); }
-}
-
+void Component::construct(Genode::Env &env) { static File_system::Main inst(env); }
diff --git a/repos/gems/src/server/cpu_sampler/main.cc b/repos/gems/src/server/cpu_sampler/main.cc
index 3880046b26..e9557eb8ee 100644
--- a/repos/gems/src/server/cpu_sampler/main.cc
+++ b/repos/gems/src/server/cpu_sampler/main.cc
@@ -199,7 +199,4 @@ struct Cpu_sampler::Main : Thread_list_change_handler
  ** Component **
  ***************/
 
-namespace Component {
-	Genode::size_t stack_size() { return 4*1024*sizeof(Genode::addr_t); }
-	void construct(Genode::Env &env) { static Cpu_sampler::Main inst(env); }
-}
+void Component::construct(Genode::Env &env) { static Cpu_sampler::Main inst(env); }
diff --git a/repos/gems/src/server/http_blk/main.cc b/repos/gems/src/server/http_blk/main.cc
index 93c944e340..5fa9eb2ae2 100644
--- a/repos/gems/src/server/http_blk/main.cc
+++ b/repos/gems/src/server/http_blk/main.cc
@@ -106,5 +106,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/gems/src/server/nit_fader/main.cc b/repos/gems/src/server/nit_fader/main.cc
index 84c3b4dcdd..ea167cd90a 100644
--- a/repos/gems/src/server/nit_fader/main.cc
+++ b/repos/gems/src/server/nit_fader/main.cc
@@ -517,7 +517,7 @@ namespace Server {
 
 	char const *name() { return "nit_fader_ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/gems/src/server/terminal_mux/main.cc b/repos/gems/src/server/terminal_mux/main.cc
index 381ef6914f..14eae69252 100644
--- a/repos/gems/src/server/terminal_mux/main.cc
+++ b/repos/gems/src/server/terminal_mux/main.cc
@@ -721,5 +721,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 4096*sizeof(long); }
 void Component::construct(Genode::Env &env) { static Main inst(env); }
diff --git a/repos/gems/src/server/wm/main.cc b/repos/gems/src/server/wm/main.cc
index f5aad2829e..86b4cd312b 100644
--- a/repos/gems/src/server/wm/main.cc
+++ b/repos/gems/src/server/wm/main.cc
@@ -149,7 +149,7 @@ namespace Server {
 
 	char const *name() { return "desktop_ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/hello_tutorial/src/hello/client/main.cc b/repos/hello_tutorial/src/hello/client/main.cc
index f600117a02..c946b30c57 100644
--- a/repos/hello_tutorial/src/hello/client/main.cc
+++ b/repos/hello_tutorial/src/hello/client/main.cc
@@ -17,9 +17,6 @@
 #include <hello_session/connection.h>
 
 
-Genode::size_t Component::stack_size() { return 64*1024; }
-
-
 void Component::construct(Genode::Env &env)
 {
 	Hello::Connection hello(env);
diff --git a/repos/hello_tutorial/src/hello/server/main.cc b/repos/hello_tutorial/src/hello/server/main.cc
index afa8858ec1..ea18e86ed5 100644
--- a/repos/hello_tutorial/src/hello/server/main.cc
+++ b/repos/hello_tutorial/src/hello/server/main.cc
@@ -83,9 +83,6 @@ struct Hello::Main
 };
 
 
-Genode::size_t Component::stack_size() { return 64*1024; }
-
-
 void Component::construct(Genode::Env &env)
 {
 	static Hello::Main main(env);
diff --git a/repos/libports/src/app/acpica/os.cc b/repos/libports/src/app/acpica/os.cc
index 8f4d0b26f0..c1e5bf2d06 100644
--- a/repos/libports/src/app/acpica/os.cc
+++ b/repos/libports/src/app/acpica/os.cc
@@ -303,5 +303,4 @@ ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 irq, ACPI_OSD_HANDLER handler,
 }
 
 
-Genode::size_t Component::stack_size()      { return 4*1024*sizeof(Genode::addr_t); }
 void Component::construct(Genode::Env &env) { static Acpica::Main main(env); }
diff --git a/repos/libports/src/server/acpi_input/main.cc b/repos/libports/src/server/acpi_input/main.cc
index 9dfa3d1c3b..5a0ab9a4ba 100644
--- a/repos/libports/src/server/acpi_input/main.cc
+++ b/repos/libports/src/server/acpi_input/main.cc
@@ -402,5 +402,5 @@ struct Transform::Main {
 	}
 };
 
-Genode::size_t Component::stack_size()      { return 2 * 1024*sizeof(Genode::addr_t); }
+
 void Component::construct(Genode::Env &env) { static Transform::Main main(env); }
diff --git a/repos/libports/src/server/fuse_fs/fuse_fs_main.cc b/repos/libports/src/server/fuse_fs/fuse_fs_main.cc
index 47330f7d60..42bfd82caf 100644
--- a/repos/libports/src/server/fuse_fs/fuse_fs_main.cc
+++ b/repos/libports/src/server/fuse_fs/fuse_fs_main.cc
@@ -544,10 +544,5 @@ struct File_system::Main
  **********************/
 
 char const *   Server::name()                            { return "fuse_fs_ep"; }
-/**
- * The large stack is needed because FUSE file system may call
- * libc functions that require a large stack, e.g. timezone
- * related functions.
- */
-Genode::size_t Server::stack_size()                      { return 8192 * sizeof(long); }
+Genode::size_t Server::stack_size()                      { return 16*1024*sizeof(long); }
 void           Server::construct(Server::Entrypoint &ep) { static File_system::Main inst(ep); }
diff --git a/repos/os/run/timer.run b/repos/os/run/timer.run
index f010007d40..c458fb7b3e 100644
--- a/repos/os/run/timer.run
+++ b/repos/os/run/timer.run
@@ -28,7 +28,7 @@ install_config {
 		<any-service><parent/><any-child/></any-service>
 	</default-route>
 	<start name="timer">
-		<resource name="RAM" quantum="10M"/>
+		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Timer"/></provides>
 	</start>
 	<start name="client">
diff --git a/repos/os/src/app/rom_logger/main.cc b/repos/os/src/app/rom_logger/main.cc
index 89d242c558..c098c42257 100644
--- a/repos/os/src/app/rom_logger/main.cc
+++ b/repos/os/src/app/rom_logger/main.cc
@@ -121,5 +121,4 @@ void Rom_logger::Main::_handle_update()
 }
 
 
-Genode::size_t Component::stack_size()      { return 4*1024*sizeof(long); }
 void Component::construct(Genode::Env &env) { static Rom_logger::Main main(env); }
diff --git a/repos/os/src/app/rom_to_file/main.cc b/repos/os/src/app/rom_to_file/main.cc
index 5ae9b31475..f443acd23a 100644
--- a/repos/os/src/app/rom_to_file/main.cc
+++ b/repos/os/src/app/rom_to_file/main.cc
@@ -161,7 +161,7 @@ namespace Server {
 
 	char const *name() { return "rom_to_file_ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/app/trace_subject_reporter/main.cc b/repos/os/src/app/trace_subject_reporter/main.cc
index a8c5933916..b80243c885 100644
--- a/repos/os/src/app/trace_subject_reporter/main.cc
+++ b/repos/os/src/app/trace_subject_reporter/main.cc
@@ -230,7 +230,7 @@ namespace Server {
 
 	char const *name() { return "trace_subject_reporter"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/app/usb_report_filter/main.cc b/repos/os/src/app/usb_report_filter/main.cc
index 54f98b77b4..ab5acb4759 100644
--- a/repos/os/src/app/usb_report_filter/main.cc
+++ b/repos/os/src/app/usb_report_filter/main.cc
@@ -433,6 +433,6 @@ struct Usb_filter::Main
 
 namespace Server {
 	char const *name()             { return "usb_report_filter_ep";    }
-	size_t      stack_size()       { return 4*1024*sizeof(addr_t);     }
+	size_t      stack_size()       { return 16*1024*sizeof(addr_t);    }
 	void construct(Entrypoint &ep) { static Usb_filter::Main main(ep); }
 }
diff --git a/repos/os/src/app/xray_trigger/main.cc b/repos/os/src/app/xray_trigger/main.cc
index 6782939608..379baca1a7 100644
--- a/repos/os/src/app/xray_trigger/main.cc
+++ b/repos/os/src/app/xray_trigger/main.cc
@@ -241,7 +241,7 @@ namespace Server {
 
 	char const *name() { return "ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep) { static Xray_trigger::Main main(ep); }
 }
diff --git a/repos/os/src/drivers/acpi/main.cc b/repos/os/src/drivers/acpi/main.cc
index 5edc2b0511..cfc0581b7f 100644
--- a/repos/os/src/drivers/acpi/main.cc
+++ b/repos/os/src/drivers/acpi/main.cc
@@ -47,11 +47,4 @@ struct Acpi::Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-	Genode::size_t stack_size()      { return 2*1024*sizeof(long);  }
-	void construct(Genode::Env &env) { static Acpi::Main main(env); }
-}
+void Component::construct(Genode::Env &env) { static Acpi::Main main(env); }
diff --git a/repos/os/src/drivers/ahci/main.cc b/repos/os/src/drivers/ahci/main.cc
index 0c694ba764..5843953704 100644
--- a/repos/os/src/drivers/ahci/main.cc
+++ b/repos/os/src/drivers/ahci/main.cc
@@ -186,7 +186,5 @@ struct Block::Main
 };
 
 
-namespace Component {
-	Genode::size_t stack_size()      { return 2 * 1024 * sizeof(long); }
-	void construct(Genode::Env &env) { static Block::Main server(env); }
-}
+
+void Component::construct(Genode::Env &env) { static Block::Main server(env); }
diff --git a/repos/os/src/drivers/framebuffer/spec/exynos/main.cc b/repos/os/src/drivers/framebuffer/spec/exynos/main.cc
index 797e7fe69f..8dfdeac34b 100644
--- a/repos/os/src/drivers/framebuffer/spec/exynos/main.cc
+++ b/repos/os/src/drivers/framebuffer/spec/exynos/main.cc
@@ -155,7 +155,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "fb_drv_ep";       }
-	size_t stack_size()            { return 1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "fb_drv_ep";          }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/gpio/spec/exynos4/main.cc b/repos/os/src/drivers/gpio/spec/exynos4/main.cc
index 194a596087..64adbc10a2 100644
--- a/repos/os/src/drivers/gpio/spec/exynos4/main.cc
+++ b/repos/os/src/drivers/gpio/spec/exynos4/main.cc
@@ -57,7 +57,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "gpio_drv_ep";     }
-	size_t stack_size()            { return 1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "gpio_drv_ep";        }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/gpio/spec/imx53/main.cc b/repos/os/src/drivers/gpio/spec/imx53/main.cc
index ef781ba167..6b5b389143 100644
--- a/repos/os/src/drivers/gpio/spec/imx53/main.cc
+++ b/repos/os/src/drivers/gpio/spec/imx53/main.cc
@@ -59,7 +59,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "gpio_drv_ep";     }
-	size_t stack_size()            { return 1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "gpio_drv_ep";        }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/gpio/spec/omap4/main.cc b/repos/os/src/drivers/gpio/spec/omap4/main.cc
index ba247c1aab..89f46551ea 100644
--- a/repos/os/src/drivers/gpio/spec/omap4/main.cc
+++ b/repos/os/src/drivers/gpio/spec/omap4/main.cc
@@ -58,7 +58,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "gpio_drv_ep";     }
-	size_t stack_size()            { return 1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "gpio_drv_ep";        }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/gpio/spec/rpi/main.cc b/repos/os/src/drivers/gpio/spec/rpi/main.cc
index 1fc751d688..33164f9c5b 100644
--- a/repos/os/src/drivers/gpio/spec/rpi/main.cc
+++ b/repos/os/src/drivers/gpio/spec/rpi/main.cc
@@ -98,7 +98,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "gpio_drv_ep";     }
-	size_t stack_size()            { return 1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "gpio_drv_ep";        }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/input/dummy/main.cc b/repos/os/src/drivers/input/dummy/main.cc
index 3f89c262ae..b72f470969 100644
--- a/repos/os/src/drivers/input/dummy/main.cc
+++ b/repos/os/src/drivers/input/dummy/main.cc
@@ -95,10 +95,4 @@ struct Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-Genode::size_t Component::stack_size() { return 2048*sizeof(long); }
-
 void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/os/src/drivers/input/spec/imx53/main.cc b/repos/os/src/drivers/input/spec/imx53/main.cc
index 42b15c0930..0b4ac3e5e2 100644
--- a/repos/os/src/drivers/input/spec/imx53/main.cc
+++ b/repos/os/src/drivers/input/spec/imx53/main.cc
@@ -62,7 +62,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "input_drv_ep";    }
-	size_t stack_size()            { return 2*1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "input_drv_ep";       }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/input/spec/ps2/pl050/main.cc b/repos/os/src/drivers/input/spec/ps2/pl050/main.cc
index 71ed94515b..77460722f0 100644
--- a/repos/os/src/drivers/input/spec/ps2/pl050/main.cc
+++ b/repos/os/src/drivers/input/spec/ps2/pl050/main.cc
@@ -69,7 +69,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "ps2_drv_ep";      }
-	size_t stack_size()            { return 2048*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "ps2_drv_ep";        }
+	size_t stack_size()            { return 8*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);     }
 }
diff --git a/repos/os/src/drivers/input/spec/ps2/x86/main.cc b/repos/os/src/drivers/input/spec/ps2/x86/main.cc
index 8e970dfe76..fbd7eef109 100644
--- a/repos/os/src/drivers/input/spec/ps2/x86/main.cc
+++ b/repos/os/src/drivers/input/spec/ps2/x86/main.cc
@@ -87,7 +87,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "ps2_drv_ep";      }
-	size_t stack_size()            { return 2048*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);   }
+	char const *name()             { return "ps2_drv_ep";        }
+	size_t stack_size()            { return 8*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);     }
 }
diff --git a/repos/os/src/drivers/nic/spec/gem/main.cc b/repos/os/src/drivers/nic/spec/gem/main.cc
index 6aa16cf3a0..7b101066fa 100644
--- a/repos/os/src/drivers/nic/spec/gem/main.cc
+++ b/repos/os/src/drivers/nic/spec/gem/main.cc
@@ -76,5 +76,5 @@ struct Server::Main
 
 
 char const * Server::name()            { return "nic_ep"; }
-size_t Server::stack_size()            { return 2*1024*sizeof(long); }
+size_t Server::stack_size()            { return 16*1024*sizeof(long); }
 void Server::construct(Entrypoint &ep) { static Main main(ep); }
diff --git a/repos/os/src/drivers/nic/spec/lan9118/main.cc b/repos/os/src/drivers/nic/spec/lan9118/main.cc
index 68655cc18c..b748ae9a88 100644
--- a/repos/os/src/drivers/nic/spec/lan9118/main.cc
+++ b/repos/os/src/drivers/nic/spec/lan9118/main.cc
@@ -74,9 +74,6 @@ class Root : public Genode::Root_component<Lan9118, Genode::Single_client>
 };
 
 
-Genode::size_t Component::stack_size() { return 2*1024*sizeof(long); }
-
-
 void Component::construct(Genode::Env &env)
 {
 	static Genode::Heap heap(env.ram(), env.rm());
diff --git a/repos/os/src/drivers/nic/spec/linux/main.cc b/repos/os/src/drivers/nic/spec/linux/main.cc
index 93b91da1cc..b26f6a6437 100644
--- a/repos/os/src/drivers/nic/spec/linux/main.cc
+++ b/repos/os/src/drivers/nic/spec/linux/main.cc
@@ -234,5 +234,5 @@ struct Server::Main
 
 
 char const * Server::name()            { return "nic_ep"; }
-Genode::size_t Server::stack_size()    { return 2*1024*sizeof(long); }
+Genode::size_t Server::stack_size()    { return 16*1024*sizeof(long); }
 void Server::construct(Entrypoint &ep) { static Main main(ep); }
diff --git a/repos/os/src/drivers/platform/spec/x86/main.cc b/repos/os/src/drivers/platform/spec/x86/main.cc
index 0885ba29f2..4706b41cc3 100644
--- a/repos/os/src/drivers/platform/spec/x86/main.cc
+++ b/repos/os/src/drivers/platform/spec/x86/main.cc
@@ -141,5 +141,5 @@ struct Platform::Main
 	}
 };
 
-Genode::size_t Component::stack_size()      { return STACK_SIZE; }
+
 void Component::construct(Genode::Env &env) { static Platform::Main main(env); }
diff --git a/repos/os/src/drivers/sd_card/spec/exynos5/main.cc b/repos/os/src/drivers/sd_card/spec/exynos5/main.cc
index 7251013874..ffc1dcbecf 100644
--- a/repos/os/src/drivers/sd_card/spec/exynos5/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/exynos5/main.cc
@@ -54,5 +54,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/os/src/drivers/sd_card/spec/imx53/bench/main.cc b/repos/os/src/drivers/sd_card/spec/imx53/bench/main.cc
index 96bd1c9c46..d9aa2afdcb 100644
--- a/repos/os/src/drivers/sd_card/spec/imx53/bench/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/imx53/bench/main.cc
@@ -173,7 +173,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "sd_card_bench_ep";  }
-	size_t stack_size()            { return 2*1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);     }
+	char const *name()             { return "sd_card_bench_ep";   }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/sd_card/spec/imx53/main.cc b/repos/os/src/drivers/sd_card/spec/imx53/main.cc
index fd9e4b5d4d..8b600e3ee9 100644
--- a/repos/os/src/drivers/sd_card/spec/imx53/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/imx53/main.cc
@@ -51,5 +51,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/os/src/drivers/sd_card/spec/omap4/bench/main.cc b/repos/os/src/drivers/sd_card/spec/omap4/bench/main.cc
index 156c61f746..56532c73da 100644
--- a/repos/os/src/drivers/sd_card/spec/omap4/bench/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/omap4/bench/main.cc
@@ -162,7 +162,7 @@ struct Main
  ************/
 
 namespace Server {
-	char const *name()             { return "sd_card_bench_ep";  }
-	size_t stack_size()            { return 2*1024*sizeof(long); }
-	void construct(Entrypoint &ep) { static Main server(ep);     }
+	char const *name()             { return "sd_card_bench_ep";   }
+	size_t stack_size()            { return 16*1024*sizeof(long); }
+	void construct(Entrypoint &ep) { static Main server(ep);      }
 }
diff --git a/repos/os/src/drivers/sd_card/spec/omap4/main.cc b/repos/os/src/drivers/sd_card/spec/omap4/main.cc
index 8521fab4ad..307aa5bf30 100644
--- a/repos/os/src/drivers/sd_card/spec/omap4/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/omap4/main.cc
@@ -51,5 +51,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/os/src/drivers/sd_card/spec/pl180/main.cc b/repos/os/src/drivers/sd_card/spec/pl180/main.cc
index d9799a4641..a53d8a293c 100644
--- a/repos/os/src/drivers/sd_card/spec/pl180/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/pl180/main.cc
@@ -64,5 +64,5 @@ struct Main
 	}
 };
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/os/src/drivers/sd_card/spec/rpi/main.cc b/repos/os/src/drivers/sd_card/spec/rpi/main.cc
index 2d107ffb0a..54241f1d05 100644
--- a/repos/os/src/drivers/sd_card/spec/rpi/main.cc
+++ b/repos/os/src/drivers/sd_card/spec/rpi/main.cc
@@ -56,5 +56,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/os/src/drivers/timer/main.cc b/repos/os/src/drivers/timer/main.cc
index e6e32d3b18..a70574964b 100644
--- a/repos/os/src/drivers/timer/main.cc
+++ b/repos/os/src/drivers/timer/main.cc
@@ -39,9 +39,5 @@ class Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-size_t Component::stack_size()        { return 2 * 1024 * sizeof(addr_t); }
-void   Component::construct(Env &env) { static Main main(env);            }
+size_t Component::stack_size()      { return 4*1024*sizeof(addr_t); }
+void Component::construct(Env &env) { static Main main(env); }
diff --git a/repos/os/src/drivers/uart/main.cc b/repos/os/src/drivers/uart/main.cc
index dc97930f9c..37995b3784 100644
--- a/repos/os/src/drivers/uart/main.cc
+++ b/repos/os/src/drivers/uart/main.cc
@@ -35,10 +35,8 @@ struct Main
 };
 
 
-namespace Component {
-	Genode::size_t stack_size() { return 2048*sizeof(Genode::addr_t); }
-	void           construct(Genode::Env &env) { static Main uart_drv(env); }
-}
+Genode::size_t Component::stack_size()      { return 8*1024*sizeof(long); }
+void Component::construct(Genode::Env &env) { static Main uart_drv(env); }
 
 
 Uart::Driver & Uart::Driver_factory::create(unsigned index, unsigned baudrate,
diff --git a/repos/os/src/drivers/uart/uart_component.h b/repos/os/src/drivers/uart/uart_component.h
index 6b041946d3..b6ffcf7f1f 100644
--- a/repos/os/src/drivers/uart/uart_component.h
+++ b/repos/os/src/drivers/uart/uart_component.h
@@ -21,6 +21,7 @@
 #include <base/rpc_server.h>
 #include <util/arg_string.h>
 #include <os/session_policy.h>
+#include <base/component.h>
 #include <root/component.h>
 #include <uart_session/uart_session.h>
 
diff --git a/repos/os/src/drivers/usb_block/main.cc b/repos/os/src/drivers/usb_block/main.cc
index efffb899b8..e5d6378616 100644
--- a/repos/os/src/drivers/usb_block/main.cc
+++ b/repos/os/src/drivers/usb_block/main.cc
@@ -823,11 +823,4 @@ struct Usb::Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-	size_t stack_size()              { return 2*1024*sizeof(long); }
-	void construct(Genode::Env &env) { static Usb::Main main(env); }
-}
+void Component::construct(Genode::Env &env) { static Usb::Main main(env); }
diff --git a/repos/os/src/server/blk_cache/main.cc b/repos/os/src/server/blk_cache/main.cc
index 1410e9b91a..6bcf64b725 100644
--- a/repos/os/src/server/blk_cache/main.cc
+++ b/repos/os/src/server/blk_cache/main.cc
@@ -82,9 +82,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size() {
-	return 2048*sizeof(Genode::addr_t); }
-
-
-void Component::construct(Genode::Env &env) {
-	static Main server(env); }
+void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/os/src/server/clipboard/main.cc b/repos/os/src/server/clipboard/main.cc
index e46acde9b8..749fb8ce49 100644
--- a/repos/os/src/server/clipboard/main.cc
+++ b/repos/os/src/server/clipboard/main.cc
@@ -215,13 +215,4 @@ struct Clipboard::Main : Rom::Module::Read_policy, Rom::Module::Write_policy
 };
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-
-	Genode::size_t stack_size() { return 4*1024*sizeof(long); }
-
-	void construct(Genode::Env &env) { static Clipboard::Main main(env); }
-}
+void Component::construct(Genode::Env &env) { static Clipboard::Main main(env); }
diff --git a/repos/os/src/server/dynamic_rom/main.cc b/repos/os/src/server/dynamic_rom/main.cc
index 79f0217018..136158ff6e 100644
--- a/repos/os/src/server/dynamic_rom/main.cc
+++ b/repos/os/src/server/dynamic_rom/main.cc
@@ -264,13 +264,4 @@ struct Dynamic_rom::Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-
-	Genode::size_t stack_size() { return 4*1024*sizeof(long); }
-
-	void construct(Genode::Env &env) { static Dynamic_rom::Main main(env); }
-}
+void Component::construct(Genode::Env &env) { static Dynamic_rom::Main main(env); }
diff --git a/repos/os/src/server/fs_log/main.cc b/repos/os/src/server/fs_log/main.cc
index c2f5811b4f..69e0ecdc27 100644
--- a/repos/os/src/server/fs_log/main.cc
+++ b/repos/os/src/server/fs_log/main.cc
@@ -193,12 +193,6 @@ class Fs_log::Root_component :
 };
 
 
-/***************
- ** Component **
- ***************/
-
-Genode::size_t Component::stack_size() { return 4*1024*sizeof(long); }
-
 void Component::construct(Genode::Env &env)
 {
 	static Genode::Sliced_heap sliced_heap { env.ram(), env.rm() };
diff --git a/repos/os/src/server/fs_rom/main.cc b/repos/os/src/server/fs_rom/main.cc
index 8128ee71fa..371ba5ff28 100755
--- a/repos/os/src/server/fs_rom/main.cc
+++ b/repos/os/src/server/fs_rom/main.cc
@@ -358,7 +358,6 @@ class Rom_root : public Genode::Root_component<Rom_session_component>
 		}
 };
 
-Genode::size_t Component::stack_size() { return 2*1024*sizeof(long); }
 
 void Component::construct(Genode::Env &env)
 {
diff --git a/repos/os/src/server/input_merger/main.cc b/repos/os/src/server/input_merger/main.cc
index a4a569e68f..1830925c76 100644
--- a/repos/os/src/server/input_merger/main.cc
+++ b/repos/os/src/server/input_merger/main.cc
@@ -139,10 +139,4 @@ struct Input_merger::Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-Genode::size_t Component::stack_size() { return 4*1024*sizeof(Genode::addr_t); }
-
 void Component::construct(Genode::Env &env) { static Input_merger::Main inst(env); }
diff --git a/repos/os/src/server/log_report/main.cc b/repos/os/src/server/log_report/main.cc
index 59c61f45e7..ade2427fc4 100644
--- a/repos/os/src/server/log_report/main.cc
+++ b/repos/os/src/server/log_report/main.cc
@@ -116,7 +116,7 @@ namespace Server {
 
 	char const *name() { return "log_report_ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/server/log_terminal/main.cc b/repos/os/src/server/log_terminal/main.cc
index 6d4e5da7f5..e2a81880c7 100644
--- a/repos/os/src/server/log_terminal/main.cc
+++ b/repos/os/src/server/log_terminal/main.cc
@@ -188,7 +188,7 @@ namespace Server {
 
 	char const *name() { return "log_terminal_ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/server/mixer/mixer.cc b/repos/os/src/server/mixer/mixer.cc
index c0bc2d6f14..63c169fe5c 100644
--- a/repos/os/src/server/mixer/mixer.cc
+++ b/repos/os/src/server/mixer/mixer.cc
@@ -725,8 +725,4 @@ struct Mixer::Main
 };
 
 
-Genode::size_t Component::stack_size() {
-	return 4*1024*sizeof(Genode::addr_t); }
-
-void Component::construct(Genode::Env &env) {
-	static Mixer::Main inst(env); }
+void Component::construct(Genode::Env &env) { static Mixer::Main inst(env); }
diff --git a/repos/os/src/server/nic_bridge/main.cc b/repos/os/src/server/nic_bridge/main.cc
index de7bc3feb7..00ba9eb6d6 100644
--- a/repos/os/src/server/nic_bridge/main.cc
+++ b/repos/os/src/server/nic_bridge/main.cc
@@ -65,9 +65,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size() {
-	return 2048*sizeof(Genode::addr_t); }
-
-
-void Component::construct(Genode::Env &env) {
-	static Main nic_bridge(env); }
+void Component::construct(Genode::Env &env) { static Main nic_bridge(env); }
diff --git a/repos/os/src/server/nic_loopback/main.cc b/repos/os/src/server/nic_loopback/main.cc
index 67a5d8b4f0..2fdd595a50 100644
--- a/repos/os/src/server/nic_loopback/main.cc
+++ b/repos/os/src/server/nic_loopback/main.cc
@@ -209,7 +209,7 @@ namespace Server {
 
 	char const *name() { return "nicloop_ep"; }
 
-	size_t stack_size() { return 2*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/server/nic_router/main.cc b/repos/os/src/server/nic_router/main.cc
index 55600b2a49..6c413f9de5 100644
--- a/repos/os/src/server/nic_router/main.cc
+++ b/repos/os/src/server/nic_router/main.cc
@@ -56,9 +56,4 @@ Main::Main(Env &env)
 }
 
 
-/***************
- ** Component **
- ***************/
-
-size_t Component::stack_size()        { return 4 * 1024 * sizeof(addr_t); }
-void   Component::construct(Env &env) { static Main main(env); }
+void Component::construct(Env &env) { static Main main(env); }
diff --git a/repos/os/src/server/nit_fb/main.cc b/repos/os/src/server/nit_fb/main.cc
index 3764c2237c..97e3d70369 100644
--- a/repos/os/src/server/nit_fb/main.cc
+++ b/repos/os/src/server/nit_fb/main.cc
@@ -346,11 +346,5 @@ struct Nit_fb::Main : View_updater
 };
 
 
-/***************
- ** Component **
- ***************/
-
-Genode::size_t Component::stack_size() { return 4*1024*sizeof(long); }
-
 void Component::construct(Genode::Env &env) { static Nit_fb::Main inst(env); }
 
diff --git a/repos/os/src/server/nitpicker/main.cc b/repos/os/src/server/nitpicker/main.cc
index dcf34c4e98..e58f8248be 100644
--- a/repos/os/src/server/nitpicker/main.cc
+++ b/repos/os/src/server/nitpicker/main.cc
@@ -1397,13 +1397,4 @@ void Nitpicker::Main::handle_fb_mode()
 }
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-
-	Genode::size_t stack_size() { return 4*1024*sizeof(long); }
-
-	void construct(Genode::Env &env) { static Nitpicker::Main nitpicker(env); }
-}
+void Component::construct(Genode::Env &env) { static Nitpicker::Main nitpicker(env); }
diff --git a/repos/os/src/server/part_blk/main.cc b/repos/os/src/server/part_blk/main.cc
index 5bab913267..962e43ebfc 100644
--- a/repos/os/src/server/part_blk/main.cc
+++ b/repos/os/src/server/part_blk/main.cc
@@ -90,9 +90,4 @@ Block::Partition_table & Main::_table()
 }
 
 
-Genode::size_t Component::stack_size() {
-	return 2048*sizeof(Genode::addr_t); }
-
-
-void Component::construct(Genode::Env &env) {
-	static Main main(env); }
+void Component::construct(Genode::Env &env) { static Main main(env); }
diff --git a/repos/os/src/server/ram_blk/main.cc b/repos/os/src/server/ram_blk/main.cc
index 765dc525ef..6ce58f5f82 100644
--- a/repos/os/src/server/ram_blk/main.cc
+++ b/repos/os/src/server/ram_blk/main.cc
@@ -203,11 +203,4 @@ struct Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-namespace Component {
-	Genode::size_t      stack_size() { return 2*1024*sizeof(long); }
-	void construct(Genode::Env &env) { static Main server(env);    }
-}
+void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/os/src/server/ram_fs/main.cc b/repos/os/src/server/ram_fs/main.cc
index 65f8d62e1a..fa053d8b6a 100644
--- a/repos/os/src/server/ram_fs/main.cc
+++ b/repos/os/src/server/ram_fs/main.cc
@@ -656,5 +656,5 @@ struct File_system::Main
  **********************/
 
 char const *   Server::name()                            { return "ram_fs_ep"; }
-Genode::size_t Server::stack_size()                      { return 2048 * sizeof(long); }
+Genode::size_t Server::stack_size()                      { return 16*1024*sizeof(long); }
 void           Server::construct(Server::Entrypoint &ep) { static File_system::Main inst(ep); }
diff --git a/repos/os/src/server/report_rom/main.cc b/repos/os/src/server/report_rom/main.cc
index d6c87e2260..b5a6a0d7f4 100644
--- a/repos/os/src/server/report_rom/main.cc
+++ b/repos/os/src/server/report_rom/main.cc
@@ -49,11 +49,5 @@ struct Report_rom::Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-Genode::size_t Component::stack_size() { return 4*1024*sizeof(long); }
-
 void Component::construct(Genode::Env &env) { static Report_rom::Main main(env); }
 
diff --git a/repos/os/src/server/rom_blk/main.cc b/repos/os/src/server/rom_blk/main.cc
index 5836963d59..66c5bff859 100644
--- a/repos/os/src/server/rom_blk/main.cc
+++ b/repos/os/src/server/rom_blk/main.cc
@@ -123,5 +123,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main server(env);    }
+void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/os/src/server/rom_filter/main.cc b/repos/os/src/server/rom_filter/main.cc
index 1230603518..586cbf71ac 100644
--- a/repos/os/src/server/rom_filter/main.cc
+++ b/repos/os/src/server/rom_filter/main.cc
@@ -337,7 +337,7 @@ namespace Server {
 
 	char const *name() { return "conditional_rom_ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/server/trace_fs/main.cc b/repos/os/src/server/trace_fs/main.cc
index 15005f8bb2..b7fb36b768 100644
--- a/repos/os/src/server/trace_fs/main.cc
+++ b/repos/os/src/server/trace_fs/main.cc
@@ -1053,5 +1053,5 @@ struct File_system::Main
  **********************/
 
 char const *   Server::name()                            { return "trace_fs_ep"; }
-Genode::size_t Server::stack_size()                      { return 32 * 2048 * sizeof(long); }
+Genode::size_t Server::stack_size()                      { return 64*1024*sizeof(long); }
 void           Server::construct(Server::Entrypoint &ep) { static File_system::Main inst(ep); }
diff --git a/repos/os/src/server/vfs/main.cc b/repos/os/src/server/vfs/main.cc
index 4aa8353a98..b2e7b63e78 100644
--- a/repos/os/src/server/vfs/main.cc
+++ b/repos/os/src/server/vfs/main.cc
@@ -662,12 +662,6 @@ class Vfs_server::Root :
 };
 
 
-/***************
- ** Component **
- ***************/
-
-Genode::size_t Component::stack_size() { return 2*1024*sizeof(long); }
-
 void Component::construct(Genode::Env &env)
 {
 	static Genode::Sliced_heap sliced_heap { &env.ram(), &env.rm() };
diff --git a/repos/os/src/test/blk/bench/main.cc b/repos/os/src/test/blk/bench/main.cc
index 8913f98f95..f60f118c90 100644
--- a/repos/os/src/test/blk/bench/main.cc
+++ b/repos/os/src/test/blk/bench/main.cc
@@ -156,7 +156,7 @@ struct Test::Main
 namespace Server {
 
 	char const *name()          { return "block_bench_ep"; };
-	Genode::size_t stack_size() { return 2*1024*sizeof(long); }
+	Genode::size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/test/blk/cli/main.cc b/repos/os/src/test/blk/cli/main.cc
index 12e3c79b6a..62b6fdee15 100644
--- a/repos/os/src/test/blk/cli/main.cc
+++ b/repos/os/src/test/blk/cli/main.cc
@@ -382,10 +382,6 @@ void perform(Genode::Entrypoint &ep, Genode::Heap &heap, unsigned timeo_ms = 0)
 }
 
 
-Genode::size_t Component::stack_size() {
-	return 4096*sizeof(Genode::addr_t); }
-
-
 void Component::construct(Genode::Env &env)
 {
 	using namespace Genode;
diff --git a/repos/os/src/test/blk/srv/main.cc b/repos/os/src/test/blk/srv/main.cc
index 2405aa377f..f7bc82881c 100644
--- a/repos/os/src/test/blk/srv/main.cc
+++ b/repos/os/src/test/blk/srv/main.cc
@@ -137,9 +137,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size() {
-	return 2048*sizeof(Genode::addr_t); }
-
-
-void Component::construct(Genode::Env &env) {
-	static Main server(env); }
+void Component::construct(Genode::Env &env) { static Main server(env); }
diff --git a/repos/os/src/test/clipboard/main.cc b/repos/os/src/test/clipboard/main.cc
index a3ae8b2b77..880ca888ea 100644
--- a/repos/os/src/test/clipboard/main.cc
+++ b/repos/os/src/test/clipboard/main.cc
@@ -424,7 +424,7 @@ namespace Server {
 
 	char const *name() { return "ep"; }
 
-	size_t stack_size() { return 4*1024*sizeof(long); }
+	size_t stack_size() { return 16*1024*sizeof(long); }
 
 	void construct(Entrypoint &ep)
 	{
diff --git a/repos/os/src/test/fb_block_adapter/main.cc b/repos/os/src/test/fb_block_adapter/main.cc
index f1d0096317..9420bed0f6 100644
--- a/repos/os/src/test/fb_block_adapter/main.cc
+++ b/repos/os/src/test/fb_block_adapter/main.cc
@@ -121,5 +121,4 @@ struct Main
 };
 
 
-Genode::size_t Component::stack_size()      { return 2*1024*sizeof(long); }
-void Component::construct(Genode::Env &env) { static Main m(env);         }
+void Component::construct(Genode::Env &env) { static Main m(env); }
diff --git a/repos/os/src/test/framebuffer/main.cc b/repos/os/src/test/framebuffer/main.cc
index 29992b61aa..e0130a4920 100644
--- a/repos/os/src/test/framebuffer/main.cc
+++ b/repos/os/src/test/framebuffer/main.cc
@@ -157,7 +157,3 @@ void Component::construct(Genode::Env &env)
 	Genode::log("--- Test framebuffer ---\n");
 	static Test_environment te(env.ep());
 }
-
-
-Genode::size_t Component::stack_size() {
-	return 4*1024*sizeof(long); }
diff --git a/repos/os/src/test/input/test.cc b/repos/os/src/test/input/test.cc
index 384ff5a1e1..3534ac5e7d 100644
--- a/repos/os/src/test/input/test.cc
+++ b/repos/os/src/test/input/test.cc
@@ -106,7 +106,3 @@ void Component::construct(Genode::Env &env)
 	log("--- Test input ---\n");
 	static Test_environment te(env);
 }
-
-
-Genode::size_t Component::stack_size() {
-	return 4*1024*sizeof(long); }
diff --git a/repos/os/src/test/iso/main.cc b/repos/os/src/test/iso/main.cc
index 17937687fa..2932f4e119 100644
--- a/repos/os/src/test/iso/main.cc
+++ b/repos/os/src/test/iso/main.cc
@@ -48,13 +48,6 @@ struct Hexdump
 };
 
 
-namespace Component {
-
-	Genode::size_t stack_size() { return 4*1024*sizeof(long); }
-	void construct(Genode::Env &env);
-}
-
-
 void Component::construct(Genode::Env &env)
 {
 	Attached_rom_dataspace ds(env, "/test.txt");
diff --git a/repos/os/src/test/timeout/main.cc b/repos/os/src/test/timeout/main.cc
index 3ce9270d17..e60752c6cd 100644
--- a/repos/os/src/test/timeout/main.cc
+++ b/repos/os/src/test/timeout/main.cc
@@ -52,9 +52,4 @@ class Main
 };
 
 
-/***************
- ** Component **
- ***************/
-
-size_t Component::stack_size()        { return 4 * 1024 * sizeof(addr_t); }
-void   Component::construct(Env &env) { static Main main(env);            }
+void Component::construct(Env &env) { static Main main(env); }
diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run
index e022e14013..2e10a163c1 100644
--- a/repos/ports/run/gdb_monitor.run
+++ b/repos/ports/run/gdb_monitor.run
@@ -63,7 +63,7 @@ set config {
 		</config>
 	</start>
 	<start name="gdb_monitor">
-		<resource name="RAM" quantum="4M"/>
+		<resource name="RAM" quantum="5M"/>
 		<config>
 			<target name="test-gdb_monitor">
 				<config>
diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc
index 7f6de93205..95ceb83690 100644
--- a/repos/ports/run/netperf.inc
+++ b/repos/ports/run/netperf.inc
@@ -127,7 +127,7 @@ append_if [have_spec gpio] config {
 
 append_if $use_nic_bridge config {
 	<start name="nic_bridge">
-		<resource name="RAM" quantum="4M"/>
+		<resource name="RAM" quantum="5M"/>
 		<provides><service name="Nic"/></provides>
 		<config>}
 append_if [expr $use_nic_bridge && [have_spec linux]] config "
diff --git a/repos/ports/src/app/openvpn/main.cc b/repos/ports/src/app/openvpn/main.cc
index 1541328322..02679b3a58 100644
--- a/repos/ports/src/app/openvpn/main.cc
+++ b/repos/ports/src/app/openvpn/main.cc
@@ -288,6 +288,6 @@ struct Main
 
 namespace Server {
 	char const *name()             { return "openvpn_ep"; }
-	Genode::size_t stack_size()    { return 8 * 1024 * sizeof (addr_t); }
+	Genode::size_t stack_size()    { return 16*1024*sizeof(addr_t); }
 	void construct(Entrypoint &ep) { static Main server(ep); }
 }