diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f25fe4a..2991dd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,8 @@ firmware-build:
   stage: build
   image: python:2.7-stretch
   script:
-    - pio run -t clean
-    - platformio ci --lib="." --board=esp12e examples/mesh/mesh.cpp
+    - platformio run -t clean
+    - platformio ci --lib="." --board=esp12e src/examples/mesh/mesh.cpp
   artifacts:
     paths:
       - .pioenvs/*/firmware.*
diff --git a/platformio.ini b/platformio.ini
index 95b085d..4402823 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,6 +13,10 @@ env_default = meshMqttBridge
 
 [common]
 framework = arduino
+platform = espressif8266
+board = esp12e
+upload_speed = 921600
+monitor_baud = 115200
 lib_deps = 
     ESP Async WebServer
     ESPAsyncTCP
@@ -23,10 +27,10 @@ src_filter = +<*> -<examples/>
 #platform = https://github.com/platformio/platform-espressif8266.git#feature/stage
 #platform = https://github.com/platformio/platform-espressif8266.git
 #platform = espressif8266@~1.6.0
-platform = espressif8266
-board = esp12e
-upload_speed = 921600
-monitor_baud = 115200
+platform = ${common.platform}
+board = ${common.board}
+upload_speed = ${common.upload_speed}
+monitor_baud = ${common.monitor_baud}
 framework = ${common.framework}
 lib_deps = ${common.lib_deps}
 #build_flags = -DLED_PIN=2 -g
@@ -35,10 +39,10 @@ lib_deps = ${common.lib_deps}
 
 [env:basic]
 src_filter = +<*> +<examples/basic/> -<examples/mesh/> -<examples/mqttBridge/>
-platform = espressif8266
-board = esp12e
-upload_speed = 921600
-monitor_baud = 115200
+platform = ${common.platform}
+board = ${common.board}
+upload_speed = ${common.upload_speed}
+monitor_baud = ${common.monitor_baud}
 framework = ${common.framework}
 lib_deps = ${common.lib_deps}
     ESPAsyncWifiManager
@@ -46,10 +50,10 @@ lib_deps = ${common.lib_deps}
 
 [env:mesh]
 src_filter = +<*> +<examples/mesh/> -<examples/basic/> -<examples/mqttBridge/>
-platform = espressif8266
-board = esp12e
-upload_speed = 921600
-monitor_baud = 115200
+platform = ${common.platform}
+board = ${common.board}
+upload_speed = ${common.upload_speed}
+monitor_baud = ${common.monitor_baud}
 framework = ${common.framework}
 lib_deps = ${common.lib_deps}
     painlessMesh
@@ -58,8 +62,8 @@ lib_deps = ${common.lib_deps}
 src_filter = +<*> +<examples/mesh/> -<examples/basic/> -<examples/mesh/>
 platform = espressif8266
 board = esp12e
-upload_speed = 921600
-monitor_baud = 115200
+upload_speed = ${common.upload_speed}
+monitor_baud = ${common.monitor_baud}
 framework = ${common.framework}
 lib_deps = ${common.lib_deps}
     painlessMesh