diff --git a/docs b/docs
index c2b86cce..ad5bd94f 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit c2b86cce5018dfe260b7c1bdd23a46696b2da752
+Subproject commit ad5bd94f7ca41235fe183c445bb4680cea1e0f63
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index c08c7438..b4b0d56a 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -75,10 +75,7 @@ def BuildProgram(env):
         env.Prepend(_LIBFLAGS="-Wl,--start-group ")
         env.Append(_LIBFLAGS=" -Wl,--end-group")
 
-    program = env.Program(
-        os.path.join("$BUILD_DIR", env.subst("$PROGNAME$PROGSUFFIX")),
-        env["PIOBUILDFILES"],
-    )
+    program = env.Program("$PROGPATH", env["PIOBUILDFILES"])
     env.Replace(PIOMAINPROG=program)
 
     AlwaysBuild(
diff --git a/tests/commands/test_run.py b/tests/commands/test_run.py
index c91594e2..23d1e096 100644
--- a/tests/commands/test_run.py
+++ b/tests/commands/test_run.py
@@ -47,7 +47,7 @@ Import("env")
 def post_prog_action(source, target, env):
     print("post_prog_action is called")
 
-env.AddPostAction("$PROG_PATH", post_prog_action)
+env.AddPostAction("$PROGPATH", post_prog_action)
     """
     )
     tmpdir.join("post_script.py").write(