diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 0d879ad..fe57afc 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -11,7 +11,7 @@ jobs:
     name: Build wheels on ${{ matrix.os }} for Python ${{ matrix.python }}
     runs-on: ${{ matrix.os }}
     env:
-      BUILD_COMMIT: master
+      BUILD_COMMIT: main
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -35,6 +35,7 @@ jobs:
       - name: Build wheels
         env:
           CIBW_BUILD: ${{ matrix.python }}-*
+          CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND: python -m pytest {package}/py/tests -v
           # Move to 2010 or 2014 for the next release (or when matplotlib does)
@@ -63,10 +64,12 @@ jobs:
         with:
           python-version: '3.8'
       - name: Anaconda upload
-        if: "!contains( github.ref, 'master')"
+        if: "contains( github.ref, 'master')"
         env:
           ANACONDA_ORG: multibuild-wheels-staging
         run: |
           python -m pip install pip --upgrade
+          python -m pip install wheel
+          pip install git+https://github.com/Anaconda-Platform/anaconda-project
           pip install git+https://github.com/Anaconda-Server/anaconda-client
           anaconda --token ${{ secrets.KIWI_STAGING_UPLOAD_TOKEN }} upload --force -u ${ANACONDA_ORG} dist/*.whl
diff --git a/.travis.yml b/.travis.yml
index 1735256..d12d5cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 env:
   global:
-      # Daily commit is used on master branch and build commit on named
-      # branches
+      # Daily commit is used on main branch and build commit on named branches.
       - BUILD_COMMIT=1.3.0
-      - DAILY_COMMIT=master
+      - DAILY_COMMIT=main
       - REPO_DIR=kiwi
       - PLAT=x86_64
       - UNICODE_WIDTH=32
@@ -69,7 +68,6 @@ jobs:
     - os: linux
       arch: ppc64le
       python: 3.8
-      arch: ppc64le
       env:
         - PLAT=ppc64le
         - MB_ML_VER=2014
@@ -79,7 +77,6 @@ jobs:
     - os: linux
       arch: ppc64le
       python: 3.9
-      arch: ppc64le
       env:
         - PLAT=ppc64le
         - MB_ML_VER=2014
@@ -116,8 +113,9 @@ after_success:
       fi
     - which pip
     - which python
+    - pip install git+https://github.com/Anaconda-Platform/anaconda-project;
     - pip install git+https://github.com/Anaconda-Server/anaconda-client;
     - python -V
     - if [ -n "${TOKEN}" ] ; then
         anaconda -t ${TOKEN} upload --force -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl;
-      fi
\ No newline at end of file
+      fi