diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..aa944f9e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,40 @@
+name: fastlane build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    name: Build schemes
+    strategy:
+      matrix:
+        os:
+          - macos-11
+        platform:
+          - tvOS
+          - iOS
+        xcode:
+          - ^12
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6 # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install VLCKit
+        run: "carthage update"
+      - use: mxcl/xcodebuild@v1
+        with:
+          xcode: ${{ matrix.xcode }}
+          platform: ${{ matrix.platform }}
+          action: build             # default = `test`
+          code-coverage: true       # default = `false`
+          warnings-as-errors: true  # default = `false`
+          configuration: release    # no default, ie. `xcodebuild` decides itself
+      
diff --git a/.github/workflows/fastlane-build.yml b/.github/workflows/fastlane-build.yml
deleted file mode 100644
index 4f485f09..00000000
--- a/.github/workflows/fastlane-build.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: fastlane build
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-    name: Build and Test default scheme using any available iPhone simulator
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6 # Not needed with a .ruby-version file
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Carthage
-        run: "carthage update"
-      - uses: sersoft-gmbh/xcodebuild-action@v1
-        with:
-          project: JellyfinPlayer.xcodeproj
-          scheme: JellyfinPlayer
-          destination: platform=iOS
-          action: build