diff --git a/.gitignore b/.gitignore
index 3a2b803..0f271c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,3 @@
 .ionide
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
-firmware/main/insights_auth_key.txt
diff --git a/firmware/components/insa/src/ui/SplashScreen.cpp b/firmware/components/insa/src/ui/SplashScreen.cpp
index 9e00f8c..a380f48 100644
--- a/firmware/components/insa/src/ui/SplashScreen.cpp
+++ b/firmware/components/insa/src/ui/SplashScreen.cpp
@@ -1,8 +1,6 @@
 #include "ui/SplashScreen.h"
 
-#include "analytics.h"
 #include "ui/MainMenu.h"
-#include "wifi_manager.h"
 
 uint64_t splashTime = 0;
 
diff --git a/firmware/main/Kconfig.projbuild b/firmware/main/Kconfig.projbuild
index acce9ea..ebc2ba9 100644
--- a/firmware/main/Kconfig.projbuild
+++ b/firmware/main/Kconfig.projbuild
@@ -1,18 +1,27 @@
 menu "System Control"
     menu "WiFi Configuration"
+        config WIFI_ENABLED
+            bool    "Enable WiFi"
+            default y
+            help
+                Enable or disable WiFi connectivity.
+
         config WIFI_SSID
+            depends on WIFI_ENABLED
             string  "WiFi SSID"
             default "YourSSID"
             help
                 The SSID of the WiFi network to connect to.
 
         config WIFI_PASSWORD
+            depends on WIFI_ENABLED
             string  "WiFi Password"
             default "YourPassword"
             help
                 The password of the WiFi network to connect to.
 
         config WIFI_CONNECT_RETRIES
+            depends on WIFI_ENABLED
             int     "WiFi Connection Retry Attempts"
             default 5
             help
diff --git a/firmware/main/app_task.cpp b/firmware/main/app_task.cpp
index 2323c28..349b89d 100644
--- a/firmware/main/app_task.cpp
+++ b/firmware/main/app_task.cpp
@@ -11,6 +11,7 @@
 #include "hal_esp32/PersistenceManager.h"
 #include "i2c_checker.h"
 #include "led_status.h"
+#include "sdkconfig.h"
 #include "u8g2.h"
 #include "ui/ClockScreenSaver.h"
 #include "ui/ScreenSaver.h"
@@ -166,8 +167,10 @@ void app_task(void *args)
     setup_buttons();
     init_ui();
 
+#if CONFIG_WIFI_ENABLED
     wifi_manager_init();
     analytics_init();
+#endif
 
     auto oldTime = esp_timer_get_time();