diff --git a/repos/base-pistachio/src/kernel/pistachio/target.mk b/repos/base-pistachio/src/kernel/pistachio/target.mk
index 38d9287acf..064034247a 100644
--- a/repos/base-pistachio/src/kernel/pistachio/target.mk
+++ b/repos/base-pistachio/src/kernel/pistachio/target.mk
@@ -68,11 +68,15 @@ clean cleanall:
 #
 LIBS += syscall-pistachio
 
-$(TARGET): sigma0 kickstart
+$(TARGET): $(INSTALL_DIR)/sigma0-pistachio \
+           $(INSTALL_DIR)/kickstart-pistachio \
+           $(INSTALL_DIR)/pistachio
 
-sigma0:
-	$(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/serv/sigma0/sigma0
+$(INSTALL_DIR)/sigma0-pistachio:
+	$(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/serv/sigma0/sigma0 $@
 
-kickstart:
-	$(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/util/kickstart/kickstart
+$(INSTALL_DIR)/kickstart-pistachio:
+	$(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/util/kickstart/kickstart $@
 
+$(INSTALL_DIR)/pistachio: $(KERNEL_BUILD_DIR)/x86-kernel
+	$(VERBOSE)ln -sf $< $@
diff --git a/tool/run/boot_dir/pistachio b/tool/run/boot_dir/pistachio
index 4074a5f0db..2d5fb7663e 100644
--- a/tool/run/boot_dir/pistachio
+++ b/tool/run/boot_dir/pistachio
@@ -16,11 +16,9 @@ proc run_boot_dir {binaries} {
 
 	build_core_image $binaries
 
-	exec mkdir -p [run_dir]/pistachio
-
-	exec cp kernel/pistachio/kernel    [run_dir]/pistachio
-	exec cp kernel/pistachio/sigma0    [run_dir]/pistachio
-	exec cp kernel/pistachio/kickstart [run_dir]/pistachio
+	exec cp bin/pistachio           [run_dir]/kernel
+	exec cp bin/sigma0-pistachio    [run_dir]/sigma0
+	exec cp bin/kickstart-pistachio [run_dir]/kickstart
 
 	if {[have_include "image/iso"] || [have_include "image/disk"]} {
 
@@ -39,9 +37,9 @@ proc run_boot_dir {binaries} {
 		puts $fh "timeout 0"
 		puts $fh "default 0"
 		puts $fh "\ntitle Genode on L4ka::Pistachio"
-		puts $fh " kernel /pistachio/kickstart"
-		puts $fh " module /pistachio/kernel"
-		puts $fh " module /pistachio/sigma0"
+		puts $fh " kernel /kickstart"
+		puts $fh " module /kernel"
+		puts $fh " module /sigma0"
 		puts $fh " module /image.elf"
 		close $fh
 	}
@@ -62,9 +60,9 @@ proc run_boot_dir {binaries} {
 		#
 		set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"]
 		puts $fh " exec /boot/bender"
-		puts $fh " load /pistachio/kickstart"
-		puts $fh " load /pistachio/kernel"
-		puts $fh " load /pistachio/sigma0"
+		puts $fh " load /kickstart"
+		puts $fh " load /kernel"
+		puts $fh " load /sigma0"
 		puts $fh " load /image.elf"
 		close $fh