diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml
index ec5f7a45..60dbe12e 100644
--- a/.github/workflows/x86_64.yml
+++ b/.github/workflows/x86_64.yml
@@ -80,4 +80,4 @@ jobs:
       if: ${{ matrix.os == 'windows-latest' }}
     - name: Test loader
       run:
-        qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio -kernel target/x86_64-unknown-hermit-loader/debug/rusty-loader -initrd data/hello_world -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand
+        qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio -kernel target/x86_64-unknown-hermit-loader/debug/rusty-loader -initrd data/x86_64/hello_world -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand
diff --git a/Makefile b/Makefile
index 93301f87..3ba410bf 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ endif
 # Todo - make this feature toggleable
 ifeq ($(arch), aarch64)
 opt += --features "aarch64-qemu-stdout"
-export HERMIT_APP ?= $(PWD)/data/hello_world_aarch64
+export HERMIT_APP ?= $(PWD)/data/$(arch)/hello_world
 endif
 
 CONVERT :=
diff --git a/data/hello_world_aarch64 b/data/aarch64/hello_world
similarity index 100%
rename from data/hello_world_aarch64
rename to data/aarch64/hello_world
diff --git a/data/hello_world b/data/x86_64/hello_world
similarity index 100%
rename from data/hello_world
rename to data/x86_64/hello_world