diff --git a/uninstall.sh b/uninstall.sh
index dfc744c..7bff75f 100644
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,16 +1,19 @@
 MODDIR=${0%/*}
 
-# Uninstall WebView User App
-for WVUA in "com.android.webview" "org.axpos.aosmium_wv" "app.vanadium.trichromelibrary" "app.vanadium.webview"; do
-	WVUP=$(pm dump "$WVUA" | grep "codePath=/data" | grep -o "/.*")
-		if [[ -d "$WVUP" ]]; then
-			pm uninstall $WVUA
-		fi
-done
+source $MODDIR/debloat.sh
 
-# Delete WebView User Data
-for WVD in "com.android.webview" "org.axpos.aosmium_wv" "app.vanadium.trichromelibrary" "app.vanadium.webview"; do
-	if [ -d /data/data/"$WVD" ]; then
-		rm -rf /data/data/$WVD
-	fi
-done
\ No newline at end of file
+# Wait for Boot Completed
+waitUntilBootCompleted() {
+resetprop -w sys.boot_completed 0 && return
+while [[ $(getprop sys.boot_completed) -eq 0 ]]; do
+	sleep 10
+done
+}
+
+# Uninstall Updates and Data of WebView
+(
+waitUntilBootCompleted
+sleep 3
+pm uninstall $WV1
+pm uninstall $WV2
+) &
\ No newline at end of file