diff --git a/src/modules/openmower/filesystem/root/boot/openmower/hotspot.txt b/src/modules/openmower/filesystem/root/boot/openmower/hotspot.txt
index 631fa33..6b75895 100644
--- a/src/modules/openmower/filesystem/root/boot/openmower/hotspot.txt
+++ b/src/modules/openmower/filesystem/root/boot/openmower/hotspot.txt
@@ -2,7 +2,7 @@
 # Comitup hotspot configuration
 #
 
-ap_name: OpenMower-<nn>
+ap_name: <hostname>-<nn>
 ap_password: OpenMower
 
 
@@ -12,11 +12,8 @@ ap_password: OpenMower
 # You can connect a second wifi dongle to the mower to:
 # - A: Use a big antenna dongle to improve your home wifi signal.
 # - B: Use a small & cheap dongle to only use for the hotspot
-#
-# For case A the wifi_device should be "wlan0"
-#   (the hotspot uses the internal antenna)
-# For case B the wifi_device should be "wlan1"
-#   (the hotspot uses the usb dongle)
+# If 'enable_appliance_mode: false' is set the here choosen device
+# is the one that connects to your home network.
 
 #primary_wifi_device: wlan0
 
diff --git a/src/modules/openmower/start_chroot_script b/src/modules/openmower/start_chroot_script
index adbc0c4..318d1e3 100644
--- a/src/modules/openmower/start_chroot_script
+++ b/src/modules/openmower/start_chroot_script
@@ -18,7 +18,8 @@ unpack /filesystem/root /
 chown -R pi:pi /home/pi
 chmod +x /home/pi/*.sh
 
-cp /etc/comitup.conf.example /boot/openmower/hotspot-example.txt
+cp /etc/comitup.conf.example /boot/openmower/comitup-default-example.txt
+cp /boot/openmower/hotspot.txt /boot/openmower/hotspot-example.txt
 
 echo_green "Get the latest releases-beta mower_config.sh example..."
 wget -O /boot/openmower/mower_config.txt https://github.com/ClemensElflein/open_mower_ros/raw/releases/beta/src/open_mower/config/mower_config.sh.example