diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 84d4531a948..19925a7e192 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-fbf0ee9a2ddc754e7df7071bbc249736cd42807d
+ae64aa1f1433ead3d228dcb2db18bff90e2c05f1
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index d4a8d8965dd..aa4649828e5 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -59,7 +59,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  export IMAGE_VERSION=master-2020-10-15T14-31-45
+  export IMAGE_VERSION=master-2020-10-15T20-33-46
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools
@@ -110,7 +110,7 @@ if [[ -f "${HOME}/.gitconfig" ]]; then
 fi
 
 # .netrc conditional host mount (needed for git commands inside container)
-if [[ -f "${HOME}/.gitconfig" ]]; then
+if [[ -f "${HOME}/.netrc" ]]; then
   CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.netrc,destination=/home/.netrc,readonly "
 fi