diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
index 0f099c09ad..701f6b5d80 100644
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -88,12 +88,13 @@ def esp32_create_combined_bin(source, target, env):
 
 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"])
+print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))
 
 # General options that are passed to the C and C++ compilers
 projenv.Append(
     CCFLAGS=[
         "-DAPP_VERSION=" + verObj["long"],
         "-DAPP_VERSION_SHORT=" + verObj["short"],
+        "-DAPP_ENV=" + env.get("PIOENV"),
     ]
 )
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index d224c05dca..dfa130d485 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -12,6 +12,7 @@
 #include "RTC.h"
 #include "TypeConversions.h"
 #include "main.h"
+#include "meshUtils.h"
 #include "mesh-pb-constants.h"
 #include "modules/NodeInfoModule.h"
 #include "modules/PositionModule.h"
diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
index c94899bb85..c3a669ce5d 100644
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -196,6 +196,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         // If the user has specified they don't want our node to share its location, make sure to tell the phone
         // app not to send locations on our behalf.
         fromRadioScratch.which_payload_variant = meshtastic_FromRadio_my_info_tag;
+        strncpy(myNodeInfo.pio_env, optstr(APP_ENV), sizeof(myNodeInfo.pio_env));
         fromRadioScratch.my_info = myNodeInfo;
         state = STATE_SEND_OWN_NODEINFO;