diff --git a/.travis.yml b/.travis.yml
index bd50c5f..96d8cc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,7 +81,7 @@ after_success:
           ANACONDA_ORG="multibuild-wheels-staging";
           TOKEN=${NUMPY_STAGING_UPLOAD_TOKEN};
       fi
-    - pip install git+https://github.com/Anaconda-Server/anaconda-client;
+    - pip install git+https://github.com/Anaconda-Server/anaconda-client.git@1.7.2;
     - if [ -n "${TOKEN}" ] ; then
         anaconda -t ${TOKEN} upload -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl;
       fi
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 03288b9..0af495c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,11 +106,14 @@ jobs:
   - template: azure/posix.yml
     parameters:
       name: macOS
-      vmImage: macOS-10.14
+      vmImage: macOS-10.15
       matrix:
         py_3.7_64:
           MB_PYTHON_VERSION: "3.7"
         py_3.8_64:
           MB_PYTHON_VERSION: "3.8"
+        py_3.9_universal2:
+          MB_PYTHON_VERSION: "3.9"
+          PLAT: universal2
         py_3.9_64:
           MB_PYTHON_VERSION: "3.9"
diff --git a/azure/posix.yml b/azure/posix.yml
index 5fd9252..a213662 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -59,8 +59,9 @@ jobs:
         displayName: Define build env variables
 
       - bash: |
-          set -e
+          set -ex
           echo $BUILD_COMMIT
+          
           pip install virtualenv wheel
           BUILD_DEPENDS="$CYTHON_BUILD_DEP"
 
@@ -77,7 +78,7 @@ jobs:
         displayName: Build wheel
 
       - bash: |
-          set -e
+          set -ex
           source multibuild/common_utils.sh
           source multibuild/travis_steps.sh
           source extra_functions.sh
diff --git a/config.sh b/config.sh
index 26b8098..8f3b772 100644
--- a/config.sh
+++ b/config.sh
@@ -4,16 +4,19 @@
 if [ $(uname) == "Linux" ]; then IS_LINUX=1; fi
 source gfortran-install/gfortran_utils.sh
 
+function _build_wheel {
+    build_libs
+    build_bdist_wheel $@
+}
+
 function build_wheel {
-    local lib_plat=$PLAT
     if [ -n "$IS_OSX" ]; then
         install_gfortran
     fi
     echo gcc --version
     echo `gcc --version`
-    build_libs $lib_plat
     # Fix version error for development wheels by using bdist_wheel
-    build_bdist_wheel $@
+    wrap_wheel_builder _build_wheel $@
 }
 
 function build_libs {
@@ -26,8 +29,9 @@ function build_libs {
     $PYTHON_EXE -mpip install urllib3
     $PYTHON_EXE -c"import platform; print('platform.uname().machine', platform.uname().machine)"
     basedir=$($PYTHON_EXE numpy/tools/openblas_support.py)
-    $use_sudo cp -r $basedir/lib/* /usr/local/lib
-    $use_sudo cp $basedir/include/* /usr/local/include
+    $use_sudo cp -r $basedir/lib/* $BUILD_PREFIX/lib
+    $use_sudo cp $basedir/include/* $BUILD_PREFIX/include
+    export OPENBLAS=$BUILD_PREFIX
 }
 
 function get_test_cmd {
diff --git a/gfortran-install b/gfortran-install
index d430fe6..67e8b69 160000
--- a/gfortran-install
+++ b/gfortran-install
@@ -1 +1 @@
-Subproject commit d430fe6e38b6c5149c53f775a4437964e2f7b883
+Subproject commit 67e8b6983e9db975e0af82871ee99cd81e37c58b
diff --git a/multibuild b/multibuild
index ec386ef..cc068f5 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit ec386efaa9e6840b552d845dfc4d597f6b97a2b7
+Subproject commit cc068f5b28d741bcf5898487ea63684bc5f69a8a
diff --git a/numpy b/numpy
index 9e419a0..6373ded 160000
--- a/numpy
+++ b/numpy
@@ -1 +1 @@
-Subproject commit 9e419a0359cb5dbb9ae0b2711ab7a59b121a98cf
+Subproject commit 6373ded2ed1403cc3ec40dc5d919b316a1b58e44