diff --git a/firmware/src/display.rs b/firmware/src/display.rs
index 751b4b7..faaccdb 100644
--- a/firmware/src/display.rs
+++ b/firmware/src/display.rs
@@ -4,6 +4,7 @@ use embedded_graphics::pixelcolor::BinaryColor;
 use embedded_graphics::prelude::*;
 use embedded_graphics::text::{Alignment, Baseline, Text, TextStyleBuilder};
 use embedded_hal::i2c::I2c;
+use log::info;
 use ssd1306::mode::{BufferedGraphicsMode, DisplayConfig};
 use ssd1306::prelude::I2CInterface;
 use ssd1306::rotation::DisplayRotation;
@@ -38,6 +39,8 @@ impl<I2C: I2c> Display<I2C> {
         driver.clear(BinaryColor::Off)?;
         driver.flush()?;
 
+        info!("Display: SSD1306 initialized");
+
         Ok(Display { driver })
     }
 
diff --git a/firmware/src/keypad.rs b/firmware/src/keypad.rs
index 796ca63..716dd24 100644
--- a/firmware/src/keypad.rs
+++ b/firmware/src/keypad.rs
@@ -2,6 +2,7 @@ use embassy_futures::select::select_array;
 use embassy_time::{Duration, Timer};
 use embedded_hal::digital::{InputPin, OutputPin};
 use embedded_hal_async::digital::Wait;
+use log::info;
 
 const DEBOUNCE_TIME: Duration = Duration::from_millis(10);
 
@@ -71,6 +72,8 @@ where
 {
     /// Create matrix keypad from given input columns and output rows
     pub fn new(cols: [IN; COLS], rows: [OUT; ROWS]) -> Self {
+        info!("Keypad: {}x{} matrix initialized", ROWS, COLS);
+
         Self { cols, rows }
     }
 
diff --git a/firmware/src/wifi.rs b/firmware/src/wifi.rs
index edd815a..47a7008 100644
--- a/firmware/src/wifi.rs
+++ b/firmware/src/wifi.rs
@@ -31,13 +31,15 @@ impl<'d> Wifi<'d> {
         let init = esp_wifi::initialize(EspWifiInitFor::Wifi, timer, rng, radio_clocks, clocks)?;
 
         let (device, mut controller) = wifi::new_with_mode(&init, wifi, WifiStaDevice)?;
-        debug!("Static Wifi configuration: {:?}", esp_wifi::CONFIG);
+        debug!("Wifi static configuration: {:?}", esp_wifi::CONFIG);
         debug!("Wifi configuration: {:?}", controller.get_configuration());
         debug!("Wifi capabilities: {:?}", controller.get_capabilities());
         debug!("Wifi state: {:?}", wifi::get_wifi_state());
 
-        info!("Starting Wifi controller...");
+        debug!("Wifi: Starting controller...");
         controller.start().await?;
+
+        info!("Wifi: Controller initialized");
         debug!("Wifi state: {:?}", wifi::get_wifi_state());
 
         Ok(Wifi {