diff --git a/BromiteWebView/common/service.sh b/BromiteWebView/common/service.sh
index 375fe87..0bec981 100644
--- a/BromiteWebView/common/service.sh
+++ b/BromiteWebView/common/service.sh
@@ -3,11 +3,14 @@
 # This will make your scripts compatible even if Magisk change its mount point in the future
 MODDIR=${0%/*}
 
+# wait until boot completed
+until [ `getprop sys.boot_completed`. = 1. ]; do sleep 1; done
+
 # Bromite WebView needs to be installed as user app
-sleep 30 && pm list packages -f | grep -q /data.*com.android.webview || \
+pm list packages -f | grep -q /data.*com.android.webview || \
 	pm install -r "${MODDIR}/system/app/webview/webview.apk" &
 
 # install Magisk Manager if NanoDroid migration was run
-sleep 30 && [ -f /data/adb/magisk.apk ] && \
+[ -f /data/adb/magisk.apk ] && \
 	pm install -r /data/adb/magisk.apk ; \
 	rm -f /data/adb/magisk.apk &
diff --git a/F-Droid/common/service.sh b/F-Droid/common/service.sh
index 41bebc1..8141f2b 100644
--- a/F-Droid/common/service.sh
+++ b/F-Droid/common/service.sh
@@ -3,7 +3,10 @@
 # This will make your scripts compatible even if Magisk change its mount point in the future
 MODDIR=${0%/*}
 
+# wait until boot completed
+until [ `getprop sys.boot_completed`. = 1. ]; do sleep 1; done
+
 # install Magisk Manager if NanoDroid migration was run
-sleep 30 && [ -f /data/adb/magisk.apk ] && \
+[ -f /data/adb/magisk.apk ] && \
 	pm install -r /data/adb/magisk.apk ; \
 	rm -f /data/adb/magisk.apk &
diff --git a/Full/common/service.sh b/Full/common/service.sh
index 8150edf..96c9442 100644
--- a/Full/common/service.sh
+++ b/Full/common/service.sh
@@ -11,6 +11,9 @@ LOGDIR="${MODDIR}"/.logs
 # Set current date in 20170607-12.07.25 format
 CURDATE=$(date +%Y%m%d-%I.%M.%S)
 
+# wait until boot completed
+until [ `getprop sys.boot_completed`. = 1. ]; do sleep 1; done
+
 # This script will be executed in late_start service mode
 # More info in the main Magisk thread
 for init in fstrim logscleaner sqlite external_sd permissions; do
@@ -19,11 +22,11 @@ for init in fstrim logscleaner sqlite external_sd permissions; do
 done
 
 # in Magisk Mode microG DroidGuard Helper needs to be installed as user app
-sleep 30 && pm list packages -f | grep -q /data.*org.microg.gms.droidguard || \
+pm list packages -f | grep -q /data.*org.microg.gms.droidguard || \
 	pm install -r "${MODDIR}/system/priv-app/DroidGuard/DroidGuard.apk" &
 
 # install Magisk Manager if NanoDroid migration was run
-sleep 30 && [ -f /data/adb/magisk.apk ] && \
+[ -f /data/adb/magisk.apk ] && \
 	pm install -r /data/adb/magisk.apk ; \
 	rm -f /data/adb/magisk.apk &
 
diff --git a/Full/system/etc/init.d/external_sd b/Full/system/etc/init.d/external_sd
index fbf1908..c560603 100755
--- a/Full/system/etc/init.d/external_sd
+++ b/Full/system/etc/init.d/external_sd
@@ -2,7 +2,7 @@
 
 echo "external_sd init script"
 
-# nothing to wait
+# wait until boot completed
 until [ `getprop sys.boot_completed`. = 1. ]; do sleep 1; done
 
 media_rw=$(grep "^/dev/block.*/mnt/media_rw" /proc/mounts \
diff --git a/OsmAnd/common/service.sh b/OsmAnd/common/service.sh
index 41bebc1..8141f2b 100644
--- a/OsmAnd/common/service.sh
+++ b/OsmAnd/common/service.sh
@@ -3,7 +3,10 @@
 # This will make your scripts compatible even if Magisk change its mount point in the future
 MODDIR=${0%/*}
 
+# wait until boot completed
+until [ `getprop sys.boot_completed`. = 1. ]; do sleep 1; done
+
 # install Magisk Manager if NanoDroid migration was run
-sleep 30 && [ -f /data/adb/magisk.apk ] && \
+[ -f /data/adb/magisk.apk ] && \
 	pm install -r /data/adb/magisk.apk ; \
 	rm -f /data/adb/magisk.apk &
diff --git a/microG/common/service.sh b/microG/common/service.sh
index 4d1916b..7e52a31 100644
--- a/microG/common/service.sh
+++ b/microG/common/service.sh
@@ -3,11 +3,14 @@
 # This will make your scripts compatible even if Magisk change its mount point in the future
 MODDIR=${0%/*}
 
+# wait until boot completed
+until [ `getprop sys.boot_completed`. = 1. ]; do sleep 1; done
+
 # in Magisk Mode microG DroidGuard Helper needs to be installed as user app
-sleep 30 && pm list packages -f | grep -q /data.*org.microg.gms.droidguard || \
+pm list packages -f | grep -q /data.*org.microg.gms.droidguard || \
 	pm install -r "${MODDIR}/system/priv-app/DroidGuard/DroidGuard.apk" &
 
 # install Magisk Manager if NanoDroid migration was run
-sleep 30 && [ -f /data/adb/magisk.apk ] && \
+[ -f /data/adb/magisk.apk ] && \
 	pm install -r /data/adb/magisk.apk ; \
 	rm -f /data/adb/magisk.apk &