diff --git a/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/auto_connect.py b/internal_filesystem/builtin/system/WifiService.py
similarity index 98%
rename from internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/auto_connect.py
rename to internal_filesystem/builtin/system/WifiService.py
index b7eba29e..0233c193 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/auto_connect.py
+++ b/internal_filesystem/builtin/system/WifiService.py
@@ -5,7 +5,7 @@ try:
     import network
 except Exception as e:
     have_network=False
-    print("auto_connect.py could not import network, have_network=False")
+    print("Could not import network, have_network=False")
 
 import ujson
 import os
diff --git a/internal_filesystem/lib/mpos/apps.py b/internal_filesystem/lib/mpos/apps.py
index 500d4b76..55458910 100644
--- a/internal_filesystem/lib/mpos/apps.py
+++ b/internal_filesystem/lib/mpos/apps.py
@@ -205,21 +205,14 @@ def parse_manifest(manifest_path):
 
 
 def auto_connect():
-    # A generic "start at boot" mechanism hasn't been implemented yet, so do it like this:
-    custom_auto_connect = "apps/com.example.wificonf/assets/auto_connect.py"
-    builtin_auto_connect = "builtin/apps/com.example.wificonf/assets/auto_connect.py"
-    # Maybe start_app_by_name() and start_app_by_name() could be merged so the try-except logic is not duplicated...
+    builtin_auto_connect = "builtin/system/WifiService.py"
     try:
-        stat = uos.stat(custom_auto_connect)
-        execute_script_new_thread(custom_auto_connect, True)
+        print(f"Starting {builtin_auto_connect}...")
+        stat = uos.stat(builtin_auto_connect)
+        execute_script_new_thread(builtin_auto_connect, True)
     except Exception as e:
-        try:
-            print(f"Couldn't execute {custom_auto_connect} because exception {e}, trying {builtin_auto_connect}...")
-            stat = uos.stat(builtin_auto_connect)
-            execute_script_new_thread(builtin_auto_connect, True)
-        except Exception as e:
-            print("Couldn't execute {builtin_auto_connect} because exception {e}, continuing...")
-    
+        print("Couldn't execute {builtin_auto_connect} because exception {e}, continuing...")
+
 
 class Activity: