diff --git a/setup/pi/setup-teslausb b/setup/pi/setup-teslausb
index 8f09d69..9cd22a5 100644
--- a/setup/pi/setup-teslausb
+++ b/setup/pi/setup-teslausb
@@ -48,6 +48,7 @@ function headless_setup_mark_setup_success () {
 
     rm /boot/TESLAUSB_SETUP_STARTED
     touch /boot/TESLAUSB_SETUP_FINISHED
+    sed -i'.bak' -e "s/TEMPARCHIVESERVER/$archiveserver/g" /etc/rc.local
     setup_progress "Main setup completed. Remounting file systems read only."
   fi
 }