diff --git a/CMakeLists.txt b/CMakeLists.txt
index b72284df3..470d9f820 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,13 @@ set(VERSION_MAJOR "2")
 set(VERSION_MINOR "8")
 set(VERSION_REVISION "0")
 set(CODENAME "dev")
-set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
+
+if(DEFINED ENV{EDGETX_VERSION_SUFFIX})
+  set(VERSION_SUFFIX "-$ENV{EDGETX_VERSION_SUFFIX}")
+else()
+  set(VERSION_SUFFIX "-selfbuild") # If not defined, set suffix to selfbuild
+endif()
+
 set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
 
diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py
index 4ae44a808..91ea4635a 100755
--- a/radio/util/build-firmware.py
+++ b/radio/util/build-firmware.py
@@ -25,11 +25,11 @@ def build_target(target, path, cmake_options):
     cmd = ["cmake"]
     for option, value in cmake_options.items():
         cmd.append("-D%s=%s" % (option, value))
-    if "OPENTX_VERSION_SUFFIX" in os.environ:
-        suffix = os.environ["OPENTX_VERSION_SUFFIX"]
+    if "EDGETX_VERSION_SUFFIX" in os.environ:
+        suffix = os.environ["EDGETX_VERSION_SUFFIX"]
         cmd.append('-DVERSION_SUFFIX="%s"' % suffix)
-        if suffix.startswith("N"):
-            cmd.append('-DTEST_BUILD_WARNING=YES')
+#       if not suffix.startswith("rel"):
+#           cmd.append('-DTEST_BUILD_WARNING=YES')
     cmd.append(srcdir)
 
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -69,21 +69,7 @@ def main():
     cmake_options = {}
     board_name = options[optcount]
 
-    if board_name == "sky9x":
-        cmake_options["PCB"] = "SKY9X"
-        firmware_options = options_sky9x
-        maxsize = 65536 * 4
-    elif board_name == "9xrpro":
-        cmake_options["PCB"] = "9XRPRO"
-        cmake_options["SDCARD"] = "YES"
-        firmware_options = options_sky9x
-        maxsize = 65536 * 4
-    elif board_name == "ar9x":
-        cmake_options["PCB"] = "AR9X"
-        cmake_options["SDCARD"] = "YES"
-        firmware_options = options_ar9x
-        maxsize = 65536 * 4
-    elif board_name == "x9lite":
+    if board_name == "x9lite":
         cmake_options["PCB"] = "X9LITE"
         firmware_options = options_taranis_x9lite
         maxsize = 65536 * 8
diff --git a/tools/build-companion-nightly-win32.sh b/tools/build-companion-nightly-win32.sh
index 8d21395d7..8b844a4c9 100644
--- a/tools/build-companion-nightly-win32.sh
+++ b/tools/build-companion-nightly-win32.sh
@@ -39,6 +39,8 @@ fi
 
 if [ "$3" != "" ]; then
   COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+else
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=nightly"
 fi
 
 rm -rf build
diff --git a/tools/build-companion-nightly.sh b/tools/build-companion-nightly.sh
index fe5e940b1..e7191a6ab 100755
--- a/tools/build-companion-nightly.sh
+++ b/tools/build-companion-nightly.sh
@@ -39,6 +39,8 @@ fi
 
 if [ "$3" != "" ]; then
   COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+else
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=nightly"
 fi
 
 rm -rf build
diff --git a/tools/build-companion-release.sh b/tools/build-companion-release.sh
index e8214977f..a6005f6ec 100755
--- a/tools/build-companion-release.sh
+++ b/tools/build-companion-release.sh
@@ -37,24 +37,14 @@ fi
 
 if [ "$3" != "" ]; then
   COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+else
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=release"
 fi
 
 rm -rf build
 mkdir build
 cd build
 
-cmake ${COMMON_OPTIONS} -DPCB=AR9X ${SRCDIR}
-make -j${JOBS} libsimulator
-rm CMakeCache.txt
-
-cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR}
-make -j${JOBS} libsimulator
-rm CMakeCache.txt
-
-cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
-make -j${JOBS} libsimulator
-rm CMakeCache.txt
-
 cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
 make -j${JOBS} libsimulator
 rm CMakeCache.txt
diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index 51a01b9dc..b6d5e7059 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -48,6 +48,16 @@ fi
 
 : ${SRCDIR:=$(dirname "$(pwd)/$0")/..}
 
+gh_tag=${GITHUB_REF##*/}
+gh_branch=$(git rev-parse --abbrev-ref HEAD)
+
+if [[ -z $gh_tag ]];
+then
+  export EDGETX_VERSION_SUFFIX=$gh_branch
+else
+  export EDGETX_VERSION_SUFFIX=$gh_tag
+fi
+
 : ${BUILD_TYPE:=Release}
 : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev "}
 : ${EXTRA_OPTIONS:="$EXTRA_OPTIONS"}