diff --git a/release-tools/bld_ifw_tools.py b/release-tools/bld_ifw_tools.py
index 2c10ff033a96dca299b9094bd3d9e93fc54370bc..93edefb01db71ae8ac52efb4ce04aeddaa88c6e4 100644
--- a/release-tools/bld_ifw_tools.py
+++ b/release-tools/bld_ifw_tools.py
@@ -66,7 +66,7 @@ arg_count = len(sys.argv)
 if arg_count > 2:
     configurations_dir = sys.argv[2]
 # build ifw tools
-bld_ifw_tools_impl.build_ifw('release', configurations_dir, platformIdentifier)
+bld_ifw_tools_impl.build_ifw(False, False, configurations_dir, platformIdentifier)
 
 
 
diff --git a/release-tools/bld_ifw_tools_impl.py b/release-tools/bld_ifw_tools_impl.py
index adea6e0b803c78d5568205396d7389a34500880e..7ef4ec24e0a7340db90fefa5ac58313366708919 100644
--- a/release-tools/bld_ifw_tools_impl.py
+++ b/release-tools/bld_ifw_tools_impl.py
@@ -430,15 +430,12 @@ def archive_qt():
 ###############################
 # main
 ###############################
-def build_ifw(build_mode, incremental_mode, configurations_dir, platform):
+def build_ifw(development_mode, incremental_mode, configurations_dir, platform):
     global DEVELOPMENT_MODE
     global INCREMENTAL_MODE
     global PLATFORM_IDENTIFIER
-
-    if build_mode == 'devmode':
-        DEVELOPMENT_MODE = True
-    if incremental_mode == 'incmode':
-        INCREMENTAL_MODE = True
+    DEVELOPMENT_MODE = development_mode
+    INCREMENTAL_MODE = incremental_mode
     PLATFORM_IDENTIFIER = platform
 
     # init
@@ -463,7 +460,7 @@ def build_ifw(build_mode, incremental_mode, configurations_dir, platform):
         archive_macdeployqt()
     # archive static qt package
     archive_qt()
-    if build_mode == 'devmode':
+    if DEVELOPMENT_MODE:
         #TODO, the returned values should be in config file, not return it here!
         return os.path.basename(INSTALLER_FRAMEWORK_BUILD_DIR)
     else:
diff --git a/release-tools/create_installer.py b/release-tools/create_installer.py
index 5cacd0f9d0779c821f385020547f9e6e311bea24..94ff62d359b269ad3a53ed523a86fdd356f29ea6 100644
--- a/release-tools/create_installer.py
+++ b/release-tools/create_installer.py
@@ -861,10 +861,7 @@ def install_ifw_tools():
 
     # if "devmode" mode used, then build IFW from sources
     if DEVELOPMENT_MODE:
-        if INCREMENTAL_MODE:
-            tools_dir_temp = bld_ifw_tools_impl.build_ifw('devmode', 'incmode', CONFIGURATIONS_DIR, PLATFORM_IDENTIFIER)
-        else:
-            tools_dir_temp = bld_ifw_tools_impl.build_ifw('devmode', '', CONFIGURATIONS_DIR, PLATFORM_IDENTIFIER)
+        tools_dir_temp = bld_ifw_tools_impl.build_ifw(True, INCREMENTAL_MODE, CONFIGURATIONS_DIR, PLATFORM_IDENTIFIER)
         tools_bin_path = SCRIPT_ROOT_DIR + os.sep + tools_dir_temp
     else:
         tools_dir_name = bldinstallercommon.config_section_map(CONFIG_PARSER_TARGET,'InstallerFrameworkTools')['name']