diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4cb1877..6f2d6a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,17 +1,31 @@
 name: Build driver
+
 on:
   push:
-    branches:
-      - 'master'
-      - 'releases/**'
+    branches: [ master ]
+    tags:
+      - 'v*'
   pull_request:
-  workflow_dispatch:
+    branches: [ master ]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    steps:
     
+    strategy:
+        fail-fast: false
+        matrix:
+          include:
+            - os: ubuntu-latest
+              image_url: raspios_lite_arm64:latest
+              name: arm64
+            - os: ubuntu-latest
+              image_url: raspios_lite:2022-04-04
+              name: armhf
+
+    runs-on: ${{ matrix.os }}
+    name: "Build libphotonlibcamera - ${{ matrix.image_url }}"
+
+    steps:
     - uses: actions/checkout@v3
     - uses: pguyot/arm-runner-action@v2
       with:
@@ -29,11 +43,11 @@ jobs:
 
     - uses: actions/upload-artifact@master
       with:
-        name: libcamera-driver
+        name: libcamera-driver-${{ matrix.name }}
         path: build-pi/*.so
     - uses: actions/upload-artifact@master
       with:
-        name: libcamera-meme
+        name: libcamera-meme-${{ matrix.name }}
         path: build-pi/libcamera_meme
 
     # Push to dev release on pushes to master