diff --git a/board/common/overlay/etc/init.d/S33hostapd b/board/common/overlay/etc/init.d/S33hostapd
index 82e74bd0b1..bbdb797ff0 100755
--- a/board/common/overlay/etc/init.d/S33hostapd
+++ b/board/common/overlay/etc/init.d/S33hostapd
@@ -34,8 +34,8 @@ watch() {
     while true; do
         sleep 5
         if ! running; then
-            logger -t hostapd -s "dead, rebooting"
-            reboot
+            logger -t hostapd -s "dead, calling panic action"
+            panic_action hostapd
             break
         fi
     done
diff --git a/board/common/overlay/etc/init.d/S35wifi b/board/common/overlay/etc/init.d/S35wifi
index 828fc71d49..67d07047b6 100755
--- a/board/common/overlay/etc/init.d/S35wifi
+++ b/board/common/overlay/etc/init.d/S35wifi
@@ -57,8 +57,8 @@ watch() {
                 count=$(($count + 5))
                 logger -t wifi -s "disconnected"
             else
-                logger -t wifi -s "disconnected for $link_watch_timeout seconds, rebooting"
-                reboot
+                logger -t wifi -s "disconnected for $link_watch_timeout seconds, calling panic action"
+                panic_action wifi
             fi
         fi
     done
diff --git a/board/common/overlay/etc/init.d/S36ppp b/board/common/overlay/etc/init.d/S36ppp
index 7de9ee41ad..b3dc0be5c6 100755
--- a/board/common/overlay/etc/init.d/S36ppp
+++ b/board/common/overlay/etc/init.d/S36ppp
@@ -41,8 +41,8 @@ watch() {
                 count=$(($count + 5))
                 logger -t ppp -s "disconnected"
             else
-                logger -t ppp -s "disconnected for $link_watch_timeout seconds, rebooting"
-                reboot
+                logger -t ppp -s "disconnected for $link_watch_timeout seconds, calling panic action"
+                panic_action ppp
             fi
         fi
     done
diff --git a/board/common/overlay/etc/init.d/S37bluetooth b/board/common/overlay/etc/init.d/S37bluetooth
index 0e9a03c807..1e61009058 100755
--- a/board/common/overlay/etc/init.d/S37bluetooth
+++ b/board/common/overlay/etc/init.d/S37bluetooth
@@ -48,8 +48,8 @@ start() {
         count=$(($count + 1))
         if [ $count -ge 10 ]; then
             msg_fail "no device"
-            logger -t bluetooth -s "bluetooth device not available, rebooting"
-            reboot
+            logger -t bluetooth -s "bluetooth device not available, calling panic action"
+            panic_action bluetooth
             return 1
         fi
     done
diff --git a/board/common/overlay/etc/init.d/S40network b/board/common/overlay/etc/init.d/S40network
index 04328cfb5d..010329219a 100755
--- a/board/common/overlay/etc/init.d/S40network
+++ b/board/common/overlay/etc/init.d/S40network
@@ -34,8 +34,8 @@ watch_eth() {
                 count=$(($count + 5))
                 logger -t ethernet -s "disconnected"
             else
-                logger -t ethernet -s "disconnected for $link_watch_timeout seconds, rebooting"
-                reboot
+                logger -t ethernet -s "disconnected for $link_watch_timeout seconds, calling panic action"
+                panic_action network
             fi
         fi
     done
@@ -53,8 +53,8 @@ watch_ip() {
                 count=$(($count + 5))
                 logger -t network -s "$iface has no IP address"
             else
-                logger -t network -s "$iface had no IP address for $ip_watch_timeout seconds, rebooting"
-                reboot
+                logger -t network -s "$iface had no IP address for $ip_watch_timeout seconds, calling panic action"
+                panic_action network
             fi
         fi
     done
@@ -180,8 +180,8 @@ start() {
     
     if [ "$eth_ok" != "ok" ] && [ "$wlan_ok" != "ok" ] && [ "$ppp_ok" != "ok" ]; then
         if [ "$link_watch" == "true" ]; then
-            logger -t network -s "no network connection available, rebooting"
-            reboot
+            logger -t network -s "no network connection available, calling panic action"
+            panic_action network
             return 1
         else
             logger -t network -s "no network connection available"
diff --git a/board/common/overlay/etc/init.d/S41netwatch b/board/common/overlay/etc/init.d/S41netwatch
index 2ec59f483a..2abd6433c6 100755
--- a/board/common/overlay/etc/init.d/S41netwatch
+++ b/board/common/overlay/etc/init.d/S41netwatch
@@ -28,8 +28,8 @@ watch() {
                 count=$(($count + 1))
                 continue
             else
-                logger -t netwatch -s "cannot connect to $netwatch_host:$netwatch_port, rebooting"
-                reboot
+                logger -t netwatch -s "cannot connect to $netwatch_host:$netwatch_port, calling panic action"
+                panic_action netwatch
             fi
         fi
     done