diff --git a/scripts/build_userdata.sh b/scripts/build_userdata.sh
index e1d06dc..dc6db33 100755
--- a/scripts/build_userdata.sh
+++ b/scripts/build_userdata.sh
@@ -5,6 +5,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 ROOT=$DIR/..
 OUTPUT_DIR=$DIR/../output
 GIT_BRANCH=release3-staging
+RELEASE_BRANCH="release3"
 
 export DOCKER_BUILDKIT=1
 docker build -f $ROOT/Dockerfile.builder -t agnos-meta-builder $DIR \
@@ -29,8 +30,15 @@ function create_image() {
 
   mkdir $MNTDIR
   sudo mount $USERDATA_IMAGE $MNTDIR
-  sudo git clone --branch=$GIT_BRANCH --depth=1 https://github.com/commaai/openpilot.git $MNTDIR/openpilot.cache
-  echo "clone done for $(sudo cat $MNTDIR/openpilot.cache/common/version.h)"
+  sudo git clone --branch=$GIT_BRANCH --depth=1 https://github.com/commaai/openpilot.git $MNTDIR/openpilot
+  sudo touch $MNTDIR/.openpilot_cache
+
+  sudo git -C $MNTDIR/openpilot remote set-branches --add origin $RELEASE_BRANCH
+  sudo git -C $MNTDIR/openpilot update-ref refs/remotes/origin/$RELEASE_BRANCH refs/remotes/origin/$GIT_BRANCH
+  sudo git -C $MNTDIR/openpilot branch -m $RELEASE_BRANCH
+  sudo git -C $MNTDIR/openpilot branch --set-upstream-to=origin/$RELEASE_BRANCH
+
+  echo "clone done for $(sudo cat $MNTDIR/openpilot/common/version.h)"
   sudo umount $MNTDIR
 
   echo "Sparsify"
diff --git a/userspace/.gitattributes b/userspace/.gitattributes
index d51cf6f..12d4be2 100644
--- a/userspace/.gitattributes
+++ b/userspace/.gitattributes
@@ -3,3 +3,5 @@ usr/comma/wifi filter=lfs diff=lfs merge=lfs -text
 files/weston filter=lfs diff=lfs merge=lfs -text
 files/libeglSubDriverWayland.so.patched filter=lfs diff=lfs merge=lfs -text
 usr/comma/reset filter=lfs diff=lfs merge=lfs -text
+usr/comma/setup filter=lfs diff=lfs merge=lfs -text
+usr/comma/installer filter=lfs diff=lfs merge=lfs -text
diff --git a/userspace/usr/comma/comma.sh b/userspace/usr/comma/comma.sh
index cfcaddb..eb99294 100755
--- a/userspace/usr/comma/comma.sh
+++ b/userspace/usr/comma/comma.sh
@@ -93,7 +93,7 @@ while true; do
   $SETUP &
   echo "waiting for installer"
   while [ ! -f $INSTALLER ]; do
-    sleep 1
+    sleep 0.1
   done
 
   # run installer and wait for continue.sh
@@ -101,6 +101,6 @@ while true; do
   $INSTALLER &
   echo "running installer"
   while [ ! -f $CONTINUE ] && ps -p $! > /dev/null; do
-    sleep 1
+    sleep 0.1
   done
 done
diff --git a/userspace/usr/comma/installer b/userspace/usr/comma/installer
new file mode 100755
index 0000000..21fe0d8
--- /dev/null
+++ b/userspace/usr/comma/installer
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81fe860ae60a4058783b457b679d1a712bebbb32f8f3182f14a9a19235b6ef8a
+size 1263176
diff --git a/userspace/usr/comma/setup b/userspace/usr/comma/setup
index 734d086..978aea2 100755
Binary files a/userspace/usr/comma/setup and b/userspace/usr/comma/setup differ