diff --git a/platformio.ini b/platformio.ini
index ed8c5f6..76fb1f1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -35,6 +35,9 @@ extra_configs =
 ;default_envs = esp32dev-ble
 ;default_envs = ttgo-lora32-v1
 ;default_envs = nodemcuv2-rf
+;default_envs = rf-wifi-gateway
+;default_envs = nodemcuv2-rf2
+;default_envs = nodemcuv2-pilight
 ;default_envs = nodemcuv2-ir
 ;default_envs = nodemcuv2-ble
 ;default_envs = nodemcuv2-all
@@ -306,6 +309,46 @@ build_flags =
   '-DGateway_Name="OpenMQTTGateway_ESP8266_RF"'
 board_build.flash_mode = dout
 
+[env:rf-wifi-gateway]
+platform = ${com.esp8266_platform}
+board = nodemcuv2
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.rc-switch}
+  ${libraries.esp8266_mdns}
+build_flags = 
+  ${com-esp.build_flags}
+  '-DZgatewayRF="RF"'
+  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF_WIFI_GW"'
+  '-DRF_RECEIVER_PIN=5'
+board_build.flash_mode = dout
+
+[env:nodemcuv2-rf2]
+platform = ${com.esp8266_platform}
+board = nodemcuv2
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.newremoteswitch}
+  ${libraries.esp8266_mdns}
+build_flags = 
+  ${com-esp.build_flags}
+  '-DZgatewayRF2="RF2"'
+  '-DGateway_Name="OpenMQTTGateway_ESP8266_RF2"'
+board_build.flash_mode = dout
+
+[env:nodemcuv2-pilight]
+platform = ${com.esp8266_platform}
+board = nodemcuv2
+lib_deps =
+  ${com-esp.lib_deps}
+  ${libraries.esppilight}
+  ${libraries.esp8266_mdns}
+build_flags = 
+  ${com-esp.build_flags}
+  '-DZgatewayPilight="Pilight"'
+  '-DGateway_Name="OpenMQTTGateway_ESP8266_Pilight"'
+board_build.flash_mode = dout
+
 [env:sonoff-basic-rfr3]
 platform = ${com.esp8266_platform}
 board = esp8285