diff --git a/esp32/platformio.ini b/esp32/platformio.ini
index 1c8f383..3610e24 100644
--- a/esp32/platformio.ini
+++ b/esp32/platformio.ini
@@ -16,22 +16,69 @@ extra_configs =
 	features.ini
 	build_settings.ini
 build_cache_dir = .pio/build_cache
-default_envs = esp32cam
+default_envs = esp32-camera
 
 ; ================================================================
-; Base configuration
+; Project environments
 
-[base]
+[env:esp32-camera]
+board = esp32cam
+board_build.partitions = min_spiffs.csv
+monitor_rts = 0
+monitor_dtr = 0
+build_flags=
+    ${env.build_flags}
+	-D FT_CAMERA=1
+	-D CAMERA_MODEL_AI_THINKER=1
+    -D LED_BUILTIN=4
+    -D KEY_BUILTIN=0
+
+[env:esp32-wroom-camera]
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = qio_opi 
+board_build.partitions = default_16MB.csv
+board_upload.flash_size = 16MB
+upload_speed = 1000000
+build_flags =
+	${env.build_flags}
+	-D FT_CAMERA=1
+	-D CAMERA_MODEL_ESP32S3_WROVER=1
+    -D KEY_BUILTIN=0
+
+[env:esp32dev]
+board = esp32dev
+board_build.partitions = min_spiffs.csv
+build_flags =
+    ${env.build_flags}
+    -D LED_BUILTIN=2
+    -D KEY_BUILTIN=0
+
+
+; ================================================================
+; General environment section
+
+[env]
+platform = espressif32 @ 6.6.0
+framework = arduino
+monitor_speed = 115200
+monitor_filters = 
+	esp32_exception_decoder
+	default
+	colorize
 build_flags = 
-	-std=gnu++17
-	-Dregister=
 	${factory_settings.build_flags}
-	${features.build_flags}
+    ${features.build_flags}
 	${build_settings.build_flags}
+	-D CORE_DEBUG_LEVEL=3
+	-D register=
+	-std=gnu++17
+build_unflags = -std=gnu++11
 build_src_flags = 
 	-Wformat=2
 	-Wformat-truncation
 	-Wstack-usage=4096
+test_ignore = test_embedded
+board_build.filesystem = littlefs
 lib_deps = 
 	ArduinoJson@>=7.0.0
 	https://github.com/theelims/PsychicMqttClient.git#0.1.1
@@ -43,21 +90,6 @@ lib_deps =
 	adafruit/Adafruit PWM Servo Driver Library@^2.4.1
 	adafruit/Adafruit ST7735 and ST7789 Library@^1.10.4
     SPI
-
-
-; ================================================================
-; Basic environment section
-
-[env]
-platform = espressif32 @ 6.6.0
-framework = arduino
-build_type = release
-monitor_speed = 115200
-monitor_filters = 
-	esp32_exception_decoder
-	default
-	colorize
-build_unflags = -std=gnu++11
 extra_scripts = 
 	pre:scripts/pre_build.py
     pre:scripts/build_app.py
@@ -65,50 +97,4 @@ extra_scripts =
     scripts/rename_fw.py
 board_build.embed_files = src/certs/x509_crt_bundle.bin	
 board_ssl_cert_source = adafruit
-lib_compat_mode = strict
-
-
-; ================================================================
-; Device configurations
-
-[dev_esp32cam]
-extends = base
-board = esp32cam
-board_build.partitions = min_spiffs.csv
-monitor_rts = 0
-monitor_dtr = 0
-build_flags=
-	-D FT_CAMERA
-	-D CAMERA_MODEL_AI_THINKER
-    -D LED_BUILTIN=4
-    -D KEY_BUILTIN=0
-	${base.build_flags}
-
-[dev_esp32-s3]
-extends = base
-board = esp32-s3-devkitc-1
-board_build.arduino.memory_type = qio_opi 
-board_build.partitions = default_16MB.csv
-board_upload.flash_size = 16MB
-upload_speed = 1000000
-build_flags =
-	; -D LED_BUILTIN=2
-    -D KEY_BUILTIN=0
-	${base.build_flags}
-
-
-; ================================================================
-; Common project configurations
-
-[env:esp32cam]
-extends = dev_esp32cam
-build_flags=
-	-D CAMERA_MODEL_AI_THINKER
-	${dev_esp32cam.build_flags}
-
-[env:esp32-WROOM-cam]
-extends = dev_esp32-s3
-build_flags=
-	-D FT_CAMERA
-	-D CAMERA_MODEL_AI_THINKER
-	${dev_esp32-s3.build_flags}
\ No newline at end of file
+lib_compat_mode = strict
\ No newline at end of file