diff --git a/util/build_functions.sh b/util/build_functions.sh
index cbdb48719b..64f8a7026e 100644
--- a/util/build_functions.sh
+++ b/util/build_functions.sh
@@ -213,13 +213,15 @@ build_target() {
         fi
     done
 
-    # build tools-v2
+    # build tools-v2 when all targets are built
     g_toolsv2_root="tools-v2"
-    if [ $g_release -eq 1 ]
-    then
-        (cd ${g_toolsv2_root} && make build version=${curve_version})
-    else
-        (cd ${g_toolsv2_root} && make debug version=${curve_version})
+    if [[ "$g_target" = "*" ]]; then
+        if [ $g_release -eq 1 ]
+        then
+            (cd ${g_toolsv2_root} && make build version=${curve_version})
+        else
+            (cd ${g_toolsv2_root} && make debug version=${curve_version})
+        fi
     fi
 }
 
diff --git a/util/docker_opts.sh b/util/docker_opts.sh
index d83aeec9ec..30c2e03e13 100755
--- a/util/docker_opts.sh
+++ b/util/docker_opts.sh
@@ -9,6 +9,7 @@ g_docker_opts=(
     "-v /etc/sudoers.d/:/etc/sudoers.d/"
     "-v /etc/sudoers:/etc/sudoers:ro"
     "-v /etc/shadow:/etc/shadow:ro"
+    "-v /etc/hosts:/etc/hosts"
     "-v /var/run/docker.sock:/var/run/docker.sock"
     "-v /root/.docker:/root/.docker"
     "--ulimit core=-1"