diff --git a/includes.container/usr/lib/systemd/user/vso-migrate-repo.service b/includes.container/usr/lib/systemd/user/vso-migrate-repo.service
new file mode 100644
index 0000000..6811eb2
--- /dev/null
+++ b/includes.container/usr/lib/systemd/user/vso-migrate-repo.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=VSO Repo migration
+After=vso-pre-run.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bash /usr/libexec/vso/migrate-repo
+
+[Install]
+WantedBy=default.target
diff --git a/includes.container/usr/lib/systemd/user/vso-pre-run.service b/includes.container/usr/lib/systemd/user/vso-pre-run.service
index 3914b91..a3dec2d 100644
--- a/includes.container/usr/lib/systemd/user/vso-pre-run.service
+++ b/includes.container/usr/lib/systemd/user/vso-pre-run.service
@@ -1,8 +1,10 @@
 [Unit]
 Description=VSO Shell Pre-Run
+After=podman.service podman-restart.service podman-auto-update.service
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStartPre=/usr/bin/wait-for-connection
 ExecStart=/usr/bin/vso run -n -- echo vso container started
 
diff --git a/includes.container/usr/libexec/vso/debian.sources b/includes.container/usr/libexec/vso/debian.sources
new file mode 100644
index 0000000..662f81a
--- /dev/null
+++ b/includes.container/usr/libexec/vso/debian.sources
@@ -0,0 +1,5 @@
+Types: deb
+URIs: http://deb.debian.org/debian
+Suites: sid
+Components: main
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
diff --git a/includes.container/usr/libexec/vso/migrate-repo b/includes.container/usr/libexec/vso/migrate-repo
new file mode 100644
index 0000000..4069600
--- /dev/null
+++ b/includes.container/usr/libexec/vso/migrate-repo
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+/usr/share/apx/distrobox/distrobox enter --name apx-vso-pico -- ls /etc/apt/sources.list.d/debian.sources
+if [ "$?" -ne 2 ]; then
+	echo "already migrated"
+	exit 0
+fi
+
+set -e
+/usr/share/apx/distrobox/distrobox enter --name apx-vso-pico -- sudo cp /run/host/usr/libexec/vso/debian.sources /etc/apt/sources.list.d/debian.sources
+/usr/share/apx/distrobox/distrobox enter --name apx-vso-pico -- sudo rm /etc/apt/sources.list.d/vanilla-base.sources
diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml
index 6d201a1..cb9e4ef 100644
--- a/modules/00-vanilla-system-operator.yml
+++ b/modules/00-vanilla-system-operator.yml
@@ -82,4 +82,5 @@ modules:
   - 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-migrate-repo.service /usr/lib/systemd/user/default.target.wants/vso-migrate-repo.service
   - ln -s /usr/lib/systemd/user/vso-tasks-rotation.service /usr/lib/systemd/user/default.target.wants/vso-tasks-rotation.service