diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index 7394cce3f..89e40dda9 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -20,7 +20,7 @@ orbutils-orblogin = {}
 path = "/usr/lib/init.d/20_orbital"
 data = """
 export VT 3
-orbital orblogin launcher
+nowait orbital orblogin launcher
 unset VT
 """
 
diff --git a/config/desktop.toml b/config/desktop.toml
index 7e729da40..9928ccb7f 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -32,7 +32,7 @@ data = """
 audiod
 export BROWSER /bin/netsurf-fb
 export VT 3
-orbital orblogin launcher
+nowait orbital orblogin launcher
 unset BROWSER
 unset VT
 """
diff --git a/config/redoxer-gui.toml b/config/redoxer-gui.toml
index 04fd23f00..fd32620f2 100644
--- a/config/redoxer-gui.toml
+++ b/config/redoxer-gui.toml
@@ -14,6 +14,6 @@ data = """
 echo
 echo ## running redoxer in orbital ##
 export VT 3
-orbital redoxerd
+nowait orbital redoxerd
 unset VT
 """
diff --git a/config/wayland.toml b/config/wayland.toml
index 15dce7d01..f39d4c5ab 100644
--- a/config/wayland.toml
+++ b/config/wayland.toml
@@ -12,6 +12,7 @@ filesystem_size = 2048
 # Package settings
 [packages]
 adwaita-icon-theme = {}
+bash = {}
 gtk3 = {}
 libxcursor = {}
 mesa = {}
@@ -31,10 +32,16 @@ export WAYLAND_DISPLAY wayland-1
 glib-compile-schemas /usr/share/glib-2.0/schemas/
 """
 
+# Overridden to launch smallvil instead of orblogin
 [[files]]
-path = "/usr/lib/init.d/40_wayland"
+path = "/usr/lib/init.d/20_orbital"
 data = """
-orbital-wayland
+audiod
+export BROWSER /bin/netsurf-fb
+export VT 3
+nowait orbital orbital-wayland
+unset BROWSER
+unset VT
 """
 
 [[files]]
diff --git a/config/x11.toml b/config/x11.toml
index 03e64523c..d2ff5cd2d 100644
--- a/config/x11.toml
+++ b/config/x11.toml
@@ -63,7 +63,7 @@ data = """
 audiod
 export BROWSER /bin/netsurf-fb
 export VT 3
-orbital orbital-x11
+nowait orbital orbital-x11
 unset BROWSER
 unset VT
 """
diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml
index 2200f92d5..7dbbb006a 100644
--- a/config/x86_64/desktop-contain.toml
+++ b/config/x86_64/desktop-contain.toml
@@ -19,7 +19,7 @@ path = "/usr/lib/init.d/20_orbital"
 data = """
 audiod
 export VT 3
-orbital contain_orblogin launcher
+nowait orbital contain_orblogin launcher
 unset VT
 """