diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 8c1d15e73..cdd1388f9 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -272,7 +272,7 @@ void generalDefault()
   g_eeGeneral.stickMode = DEFAULT_MODE - 1;
 #endif
 
-#if defined(PCBTARANIS)
+#if defined(FRSKY_RELEASE)
   g_eeGeneral.templateSetup = 17; /* TAER */
 #endif
 
diff --git a/tools/build-frsky.py b/tools/build-frsky.py
index e0474e97d..e49e34b30 100755
--- a/tools/build-frsky.py
+++ b/tools/build-frsky.py
@@ -12,13 +12,19 @@ options = {
     "XLITES": {
         "PXX1": "NO",
         "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES"
+        "GVARS": "YES",
+        "PPM": "NO",
+        "DSM2": "NO",
+        "SBUS": "NO",
     },
     "X9LITE": {
         "PXX1": "NO",
         "LUA": "NO_MODEL_SCRIPTS",
         "GVARS": "YES",
-        "DEFAULT_MODE": "2"
+        "PPM": "NO",
+        "DSM2": "NO",
+        "SBUS": "NO",
+        "DEFAULT_MODE": "2",
     }
 }
 
@@ -34,7 +40,7 @@ def build(board, srcdir):
         os.mkdir("output")
     path = tempfile.mkdtemp()
     os.chdir(path)
-    os.system("cmake -DPCB=%s %s %s" % (board, cmake_options, srcdir))
+    os.system("cmake -DPCB=%s %s -DFRSKY_RELEASE=YES %s" % (board, cmake_options, srcdir))
     os.system("make firmware -j6")
     os.chdir(cwd)
     index = 0