diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index 3c951ced3..0cc2e6ba6 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -34,6 +34,11 @@
       <xsl:with-param name="value" select="@scenario" />
     </xsl:call-template>
 
+    <xsl:call-template name="boolean-by-key-value">
+      <xsl:with-param name="key" select="'RELEASE'" />
+	  <xsl:with-param name="value" select="hv/BUILD_TYPE = 'release'" />
+    </xsl:call-template>
+
     <xsl:apply-templates select="hv/DEBUG_OPTIONS" />
     <xsl:apply-templates select="hv/FEATURES" />
     <xsl:apply-templates select="hv/MEMORY" />
@@ -43,11 +48,6 @@
   </xsl:template>
 
   <xsl:template match="DEBUG_OPTIONS">
-    <xsl:call-template name="boolean-by-key-value">
-      <xsl:with-param name="key" select="'RELEASE'" />
-      <xsl:with-param name="value" select="BUILD_TYPE = 'release'" />
-    </xsl:call-template>
-
     <xsl:call-template name="integer-by-key-value">
       <xsl:with-param name="key" select="'MEM_LOGLEVEL_DEFAULT'" />
       <xsl:with-param name="value" select="MEM_LOGLEVEL" />