diff --git a/includes.container/usr/lib/systemd/user/vso-pre-run.service b/includes.container/usr/lib/systemd/user/vso-pre-run.service
new file mode 100644
index 0000000..18e6c2b
--- /dev/null
+++ b/includes.container/usr/lib/systemd/user/vso-pre-run.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=VSO Shell Pre-Run
+After=default.target
+
+[Service]
+ExecStart=/usr/bin/vso run -n -- ls || true
+
+[Install]
+WantedBy=default.target
diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml
index dbf3d8c..eb1968b 100644
--- a/modules/00-vanilla-system-operator.yml
+++ b/modules/00-vanilla-system-operator.yml
@@ -40,11 +40,6 @@ modules:
     packages:
     - dpkg-dev
     - ifstat
-- name: vso-tasks-rotation-autostart
-  type: shell
-  commands: 
-  - mkdir /usr/lib/systemd/user/default.target.wants
-  - ln -s /usr/lib/systemd/user/vso-tasks-rotation.service /usr/lib/systemd/user/default.target.wants/vso-tasks-rotation.service
 - name: adwdialog
   type: dpkg-buildpackage
   source:
@@ -74,3 +69,6 @@ modules:
   commands:
   - ln -s /usr/lib/systemd/system/vanilla-updates.service /etc/systemd/system/multi-user.target.wants/vanilla-updates.service
   - ln -s /usr/lib/systemd/system/vanilla-updates.timer /etc/systemd/system/timers.target.wants/vanilla-updates.timer
+  - mkdir -p /usr/lib/systemd/user/default.target.wants
+  - ln -s /usr/lib/systemd/user/vso-pre-run.service /usr/lib/systemd/user/default.target.wants/vso-pre-run.service
+  - ln -s /usr/lib/systemd/user/vso-tasks-rotation.service /usr/lib/systemd/user/default.target.wants/vso-tasks-rotation.service