diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD
index d24f3fab4..bda0627fa 100644
--- a/main/postmarketos-ui-weston/APKBUILD
+++ b/main/postmarketos-ui-weston/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-ui-weston
-pkgver=1
-pkgrel=5
+pkgver=2
+pkgrel=1
 pkgdesc="Meta package for weston"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -18,5 +18,5 @@ package() {
 	install -D -m644 "$srcdir"/start_weston.sh \
 		"$pkgdir"/etc/profile.d/start_weston.sh
 }
-sha512sums="432a27be3dbc83be2bee14a663d6e8c3fe1285daaeb1e08566bf1e8504cf3a680a688f15aae5c849849debe20655e01e735e1f7a3fe94bd28d083bbb0198a9f2  start_weston.sh
+sha512sums="57e664ed513ed002b3beadcda2977e750078881b9dd720fc8f7273b1082441d9767ef586923676651b48d5c4315b5d6acff5fc517ce3694cfe4d42ff4fab0f65  start_weston.sh
 94a690ed8f86c23620fa437bdcae01a851dfd9d8ffa64802be53dbb6bcd4f71cd59145f45c08a45ddd85082890095610946e6baa51fb4e9dc0b982fdc5ec2dc3  postmarketos-ui-weston.post-install"
diff --git a/main/postmarketos-ui-weston/start_weston.sh b/main/postmarketos-ui-weston/start_weston.sh
index 48c7f0dc5..ab9584ab8 100644
--- a/main/postmarketos-ui-weston/start_weston.sh
+++ b/main/postmarketos-ui-weston/start_weston.sh
@@ -17,10 +17,16 @@ if test -z "${XDG_RUNTIME_DIR}"; then
             WESTON_OPTS=" --pixman-type=${deviceinfo_weston_pixman_type}"
         fi
 
-		udevadm trigger
-		udevadm settle
-		# Workaround! See #633 for discussing a proper fix
-		(sleep 3; postmarketos-demos) &
+		# #633: Weston doesn't support autostarting applications (yet), so
+		# we try to run postmarketos-demos for 10 seconds, until it succeeds.
+		(
+			for i in $(seq 0 19); do
+				sleep 0.5
+				postmarketos-demos && break
+			done
+		) &
+
+
 		weston ${WESTON_OPTS} >/tmp/weston.log 2>&1
 
 		# In case of failure, restart after 1s