diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 6065310f4..ad2cdd4fe 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1297,140 +1297,6 @@ jobs:
         run: dpkg-buildpackage -b -d -uc -us -nc -j2
 
 
-  build-macos:
-    name: Build macOS
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v1.2.0
-
-      - name: Install macports
-        run: |
-          wget https://github.com/macports/macports-base/releases/download/v2.7.1/MacPorts-2.7.1-10.15-Catalina.pkg
-          sudo installer -pkg ./MacPorts-2.7.1-10.15-Catalina.pkg -target /
-
-      - name: Uninstall homebrew
-        run: |
-          curl -sLO https://raw.githubusercontent.com/Homebrew/install/master/uninstall.sh
-          chmod +x ./uninstall.sh
-          sudo ./uninstall.sh --force
-
-      - name: Update macports
-        run: sudo /opt/local/bin/port -v selfupdate
-
-      - name: Install packages
-        run: sudo /opt/local/bin/port -N -p install gsed wget cmake xz
-
-      - name: Install create-dmg
-        run: |
-            git clone https://github.com/create-dmg/create-dmg.git
-            cd create-dmg
-            make install
-
-      - name: Get macOS dependencies
-        shell: bash
-        run: |
-          cd ../../
-          mkdir -p strawberry-macos-dependencies/strawberry-macos-dependencies
-          cd strawberry-macos-dependencies/strawberry-macos-dependencies
-          /opt/local/bin/wget https://github.com/strawberrymusicplayer/strawberry-macos-dependencies/releases/download/latest/strawberry-macos-catalina-dependencies.tar.xz
-          tar -xf strawberry-macos-catalina-dependencies.tar.xz
-
-      - name: Add safe git directory
-        shell: bash
-        run: git config --global --add safe.directory /__w/strawberry/strawberry
-
-      - name: Create Build Environment
-        shell: bash
-        run: |
-          export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-          cmake -E make_directory build
-
-      - name: Remove -Wundef
-        shell: bash
-        run: /opt/local/bin/gsed -i '/-Wundef/d' CMakeLists.txt
-
-      - name: Configure CMake
-        shell: bash
-        env:
-          MACOSX_DEPLOYMENT_TARGET: 10.15
-          CFLAGS: -I${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/include
-          CXXFLAGS: -I${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/include
-          LDFLAGS: -L${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib -Wl,-rpath,${{github.workspace}}/strawberry-macos-dependencies/usr/lib
-          PKG_CONFIG_EXECUTABLE: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin/pkg-config
-          PKG_CONFIG_PATH: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/pkgconfig
-        working-directory: build
-        run: |
-            pwd
-            export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-            cmake .. -DCMAKE_BUILD_TYPE=Release \
-                     -DCMAKE_PREFIX_PATH=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/cmake \
-                     -DBUILD_WITH_QT6=ON \
-                     -DBUILD_WERROR=OFF \
-                     -DUSE_BUNDLE=ON \
-                     -DBoost_INCLUDE_DIR=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/include \
-                     -DProtobuf_INCLUDE_DIR=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/include \
-                     -DProtobuf_INCLUDE_DIRS=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/include \
-                     -DProtobuf_LIBRARY=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/libprotobuf.dylib \
-                     -DProtobuf_PROTOC_EXECUTABLE=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin/protoc \
-                     -DFFTW3_DIR=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr \
-                     -DICU_ROOT=${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr
-
-      - name: Build
-        working-directory: build
-        shell: bash
-        run: |
-          export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-          cmake --build . --config Release --parallel 4
-
-      - name: Fix macdeployqt and macdeploycheck
-        working-directory: build
-        shell: bash
-        run: |
-          install_name_tool -change "@rpath/QtCore.framework/Versions/A/QtCore" "/Users/runner/work/strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/QtCore.framework/Versions/A/QtCore" /Users/runner/work/strawberry/strawberry/build/3rdparty/macdeployqt/macdeployqt
-          install_name_tool -change "@rpath/QtCore.framework/Versions/A/QtCore" "/Users/runner/work/strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/QtCore.framework/Versions/A/QtCore" /Users/runner/work/strawberry/strawberry/build/ext/macdeploycheck/macdeploycheck
-
-      - name: Install
-        working-directory: build
-        shell: bash
-        run: |
-            export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-            make install
-
-      - name: Deploy
-        working-directory: build
-        shell: bash
-        env:
-          GIO_EXTRA_MODULES: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/gio/modules
-          GST_PLUGIN_SCANNER: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/libexec/gstreamer-1.0/gst-plugin-scanner
-          GST_PLUGIN_PATH: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/gstreamer-1.0
-        run: |
-            export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-            make deploy
-
-      - name: Deploy check
-        working-directory: build
-        shell: bash
-        run: |
-            export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-            make deploycheck
-
-      - name: Create DMG
-        working-directory: build
-        shell: bash
-        env:
-          GIO_EXTRA_MODULES: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/gio/modules
-          GST_PLUGIN_SCANNER: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/libexec/gstreamer-1.0/gst-plugin-scanner
-          GST_PLUGIN_PATH: ${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/lib/gstreamer-1.0
-        run: |
-            export PATH="${{github.workspace}}/../../strawberry-macos-dependencies/strawberry-macos-dependencies/usr/bin:/opt/local/bin:$PATH"
-            make dmg
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: upload-macos
-          path: build/strawberry-*.dmg
-
-
   build-windows-mingw:
     name: Build Windows MinGW
     runs-on: ubuntu-latest
@@ -2127,29 +1993,6 @@ jobs:
           path: build/StrawberrySetup*.exe
 
 
-  upload-macos:
-    name: Upload macOS DMG
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
-    needs:
-      - build-macos
-    steps:
-      - uses: actions/checkout@v1.2.0
-      - uses: actions/download-artifact@v2
-        with:
-          path: uploads
-      - name: Install SSH keys
-        uses: shimataro/ssh-key-action@v2
-        with:
-          known_hosts: ${{ secrets.KNOWN_HOSTS2 }}
-          key: ${{ secrets.SSH_KEY }}
-      - name: rsync
-        run: |
-          set -x
-          for i in $(find uploads -type f -name 'strawberry-*.dmg'); do
-            rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/
-          done
-
 
   upload-windows:
     name: Upload Windows Setup