diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh
index eedb7946..43d329d9 100755
--- a/utils/build_script_linux.sh
+++ b/utils/build_script_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Environment prerequisites:
 # 1) QT_PREFIX_PATH should be set to Qt libs folder
@@ -19,7 +19,7 @@ if [ -n "$build_prefix" ]; then
 fi
 
 if [ -n "$testnet" ]; then
-  testnet_def=-D TESTNET=TRUE
+  testnet_def="-D TESTNET=TRUE"
   ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet-
 fi
 
@@ -64,7 +64,7 @@ fi
 
 
 
-read version_str <<< $(./src/zanod --version | awk '/^Zano / { print $2 }')
+read version_str <<< $(./src/zanod --version | awk '/^Zano/ { print $2 }')
 version_str=${version_str}
 echo $version_str
 
diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh
index 953462f6..07b78b3f 100755
--- a/utils/build_script_mac_osx.sh
+++ b/utils/build_script_mac_osx.sh
@@ -8,9 +8,21 @@ curr_path=${BASH_SOURCE%/*}
 : "${ZANO_BUILD_DIR:?variable not set, see also macosx_build_config.command}"
 : "${CMAKE_OSX_SYSROOT:?CMAKE_OSX_SYSROOT should be set to macOS SDK path, e.g.: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk}"
 
+ARCHIVE_NAME_PREFIX=zano-macos-x64-
+
+if [ -n "$build_prefix" ]; then
+  ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}${build_prefix}-
+fi
+
+if [ -n "$testnet" ]; then
+  testnet_def="-D TESTNET=TRUE"
+  ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet-
+fi
+
+
 rm -rf $ZANO_BUILD_DIR; mkdir -p "$ZANO_BUILD_DIR/release"; cd "$ZANO_BUILD_DIR/release"
 
-cmake -D CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT -D BUILD_GUI=TRUE -D CMAKE_PREFIX_PATH="$ZANO_QT_PATH/clang_64" -D CMAKE_BUILD_TYPE=Release -D BOOST_ROOT="$ZANO_BOOST_ROOT" -D BOOST_LIBRARYDIR="$ZANO_BOOST_LIBS_PATH" ../..
+cmake $testnet_def -D CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT -D BUILD_GUI=TRUE -D CMAKE_PREFIX_PATH="$ZANO_QT_PATH/clang_64" -D CMAKE_BUILD_TYPE=Release -D BOOST_ROOT="$ZANO_BOOST_ROOT" -D BOOST_LIBRARYDIR="$ZANO_BOOST_LIBS_PATH" ../..
 if [ $? -ne 0 ]; then
     echo "Failed to cmake"
     exit 1
@@ -87,7 +99,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-read version_str <<< $(DYLD_LIBRARY_PATH=$ZANO_BOOST_LIBS_PATH ./connectivity_tool --version | awk '/^Zano / { print $2 }')
+read version_str <<< $(DYLD_LIBRARY_PATH=$ZANO_BOOST_LIBS_PATH ./connectivity_tool --version | awk '/^Zano/ { print $2 }')
 version_str=${version_str}
 echo $version_str
 
@@ -105,7 +117,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-package_filename="zano-macos-x64-$version_str.dmg"
+package_filename=${ARCHIVE_NAME_PREFIX}${version_str}.dmg
 
 source ../../../utils/macosx_dmg_builder.sh
 build_fancy_dmg package_folder $package_filename