diff --git a/firmware/esp32/overland-controller/overland-controller.ino b/firmware/esp32/overland-controller/overland-controller.ino
index 6ae6039..901cfc4 100644
--- a/firmware/esp32/overland-controller/overland-controller.ino
+++ b/firmware/esp32/overland-controller/overland-controller.ino
@@ -2091,7 +2091,7 @@ void connectStaWifi() {
         WiFi.begin(staSsids[i].c_str(), staPasswords[i].c_str());
 
         unsigned long start = millis();
-        while (WiFi.status() != WL_CONNECTED && millis() - start < 3000) {
+        while (WiFi.status() != WL_CONNECTED && millis() - start < 8000) {
             server.handleClient();
             oledLoop();
             delay(100);
diff --git a/firmware/esp32/overland-controller/system_status.h b/firmware/esp32/overland-controller/system_status.h
index fe73bbd..013df86 100644
--- a/firmware/esp32/overland-controller/system_status.h
+++ b/firmware/esp32/overland-controller/system_status.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define FIRMWARE_VERSION "0.5.4-bms-static-cleanup"
+#define FIRMWARE_VERSION "0.5.5-wifi-connect-window-8s"
 #define FIRMWARE_NAME "overland-controller"