diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8597a1d8..ae497db3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,6 +15,7 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
+        os: ["ubuntu-24.04-arm", "ubuntu-24.04"]
         postgres: [13, 14, 15, 16, 17]
         postgis: ['3.5']
         variant: [default, alpine]
@@ -22,12 +23,22 @@ jobs:
           - postgres: 16
             postgis: master
             variant: default
+            os: "ubuntu-24.04"
+          - postgres: 16
+            postgis: master
+            variant: default
+            os: "ubuntu-24.04-arm"
+          - postgres: 17
+            postgis: master
+            variant: default
+            os: "ubuntu-24.04"
           - postgres: 17
             postgis: master
             variant: default
+            os: "ubuntu-24.04-arm"
 
-    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
-    runs-on: ubuntu-20.04
+    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.postgis == 'master' }}
     env:
       VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}