diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run
index 4b0056652f..96289ebe83 100644
--- a/repos/gems/run/depot_autopilot.run
+++ b/repos/gems/run/depot_autopilot.run
@@ -138,7 +138,6 @@ proc autopilot_run_genode_until {{wait_for_re forever} {timeout_value 0} {runnin
 ## Utility procedures ##
 ########################
 
-proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
 
 
 #
diff --git a/repos/gems/run/depot_deploy.run b/repos/gems/run/depot_deploy.run
index 3bb67af53a..915e5ef1f4 100644
--- a/repos/gems/run/depot_deploy.run
+++ b/repos/gems/run/depot_deploy.run
@@ -1,7 +1,5 @@
 create_boot_directory
 
-proc depot_user {} { return nfeske }
-
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/pkg/[drivers_interactive_pkg] \
                   [depot_user]/src/report_rom \
diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run
index b4806428fa..d793f9a91e 100644
--- a/repos/gems/run/depot_download.run
+++ b/repos/gems/run/depot_download.run
@@ -51,8 +51,6 @@ set config {
 
 append_platform_drv_config
 
-proc depot_user { } { return genodelabs }
-
 proc depot_user_download { } {
 	return [exec cat [genode_dir]/depot/[depot_user]/download] }
 
diff --git a/repos/gems/run/leitzentrale.run b/repos/gems/run/leitzentrale.run
index f2ea75e9b0..f0f3170574 100644
--- a/repos/gems/run/leitzentrale.run
+++ b/repos/gems/run/leitzentrale.run
@@ -1,7 +1,5 @@
 create_boot_directory
 
-proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
-
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/pkg/[drivers_interactive_pkg] \
                   [depot_user]/pkg/fonts_fs \
diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run
index 28f6a17224..8534a43660 100644
--- a/repos/gems/run/sculpt.run
+++ b/repos/gems/run/sculpt.run
@@ -3,8 +3,6 @@ if {![have_spec x86] || [have_spec linux]} {
 	exit 0
 }
 
-proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
-
 if {[have_spec nova]} {
 	proc kernel_output { } { return "novga serial logmem" }
 }
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index f9e76927ba..c366240803 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -1,6 +1,4 @@
 
-proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
-
 source ${genode_dir}/repos/libports/run/qt5_drivers.inc
 
 set feature(Input) 1
diff --git a/repos/libports/run/qt5_core.run b/repos/libports/run/qt5_core.run
index f1dcd4c258..f56224b180 100644
--- a/repos/libports/run/qt5_core.run
+++ b/repos/libports/run/qt5_core.run
@@ -1,7 +1,5 @@
 create_boot_directory
 
-proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
-
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/src/init \
                   [depot_user]/src/libc \
diff --git a/repos/ports/run/stubby_deploy.run b/repos/ports/run/stubby_deploy.run
index e70bcc664b..e91b302e77 100644
--- a/repos/ports/run/stubby_deploy.run
+++ b/repos/ports/run/stubby_deploy.run
@@ -1,7 +1,6 @@
 source ${genode_dir}/repos/base/run/platform_drv.inc
 
 create_boot_directory
-proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
 
 proc current_pkg { pkg } { return $pkg/[_current_depot_archive_version pkg $pkg] }
 
diff --git a/tool/run/depot.inc b/tool/run/depot.inc
index de3cb1bebd..e2aefd3bee 100644
--- a/tool/run/depot.inc
+++ b/tool/run/depot.inc
@@ -238,6 +238,13 @@ proc _collect_from_depot { archives } {
 }
 
 
+##
+# Parse depot user from run tool arguments with a fallback to "genodelabs"
+#
+#
+proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
+
+
 ##
 # Import binary and raw content of the specified depot archives into the run
 # directory of the scenario