diff --git a/.github/workflows/release-debian.yml b/.github/workflows/release-debian.yml
index 0154836..32663f1 100644
--- a/.github/workflows/release-debian.yml
+++ b/.github/workflows/release-debian.yml
@@ -17,17 +17,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: "debian"
-            release: "buster"
-            arch: "amd64"
-          - distro: "debian"
-            release: "bullseye"
-            arch: "amd64"
           - distro: "debian"
             release: "bookworm"
             arch: "amd64"
-          - distro: "ubuntu"
-            release: "focal"
+          - distro: "debian"
+            release: "trixie"
             arch: "amd64"
           - distro: "ubuntu"
             release: "jammy"
@@ -74,22 +68,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: "debian"
-            release: "buster"
-            image: "buster"
-            arch: "armv7"
-          - distro: "debian"
-            release: "buster"
-            image: "buster"
-            arch: "aarch64"
-          - distro: "debian"
-            release: "bullseye"
-            image: "bullseye"
-            arch: "armv7"
-          - distro: "debian"
-            release: "bullseye"
-            image: "bullseye"
-            arch: "aarch64"
           - distro: "debian"
             release: "bookworm"
             image: "bookworm"
@@ -98,14 +76,16 @@ jobs:
             release: "bookworm"
             image: "bookworm"
             arch: "aarch64"
-          - distro: "ubuntu"
-            release: "focal"
-            image: "ubuntu20.04"
-            arch: "armv7"
-          - distro: "ubuntu"
-            release: "focal"
-            image: "ubuntu20.04"
-            arch: "aarch64"
+          - distro: "debian"
+            release: "trixie"
+            image: "none"
+            arch: "none"
+            base_image: --platform=linux/arm/v7 arm32v7/debian:trixie
+          - distro: "debian"
+            release: "trixie"
+            image: "none"
+            arch: "none"
+            base_image: --platform=linux/arm64 arm64v8/debian:trixie
           - distro: "ubuntu"
             release: "jammy"
             image: "ubuntu22.04"
@@ -114,31 +94,24 @@ jobs:
             release: "jammy"
             image: "ubuntu22.04"
             arch: "aarch64"
-          - distro: "raspbian"
-            release: "buster"
-            image: "buster"
-            arch: "armv7"
-          - distro: "raspbian"
-            release: "buster"
-            image: "buster"
-            arch: "aarch64"
-          - distro: "raspbian"
-            release: "bullseye"
-            image: "bullseye"
+          - distro: "ubuntu"
+            release: "noble"
+            image: "ubuntu24.04"
             arch: "armv7"
-          - distro: "raspbian"
-            release: "bullseye"
-            image: "bullseye"
+          - distro: "ubuntu"
+            release: "noble"
+            image: "ubuntu24.04"
             arch: "aarch64"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v2.8.1
+      - uses: uraimo/run-on-arch-action@v3
         name: Build artifact
         id: build
         with:
           arch: ${{ matrix.arch }}
           distro: ${{ matrix.image }}
+          base_image: ${{ matrix.base_image }}
           shell: /bin/bash
           install: |
             apt-get update
diff --git a/.github/workflows/test-debian.yml b/.github/workflows/test-debian.yml
index a092e79..fe84fdd 100644
--- a/.github/workflows/test-debian.yml
+++ b/.github/workflows/test-debian.yml
@@ -12,17 +12,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: "debian"
-            release: "buster"
-            arch: "amd64"
-          - distro: "debian"
-            release: "bullseye"
-            arch: "amd64"
           - distro: "debian"
             release: "bookworm"
             arch: "amd64"
-          - distro: "ubuntu"
-            release: "focal"
+          - distro: "debian"
+            release: "trixie"
             arch: "amd64"
           - distro: "ubuntu"
             release: "jammy"
@@ -56,22 +50,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: "debian"
-            release: "buster"
-            image: "buster"
-            arch: "armv7"
-          - distro: "debian"
-            release: "buster"
-            image: "buster"
-            arch: "aarch64"
-          - distro: "debian"
-            release: "bullseye"
-            image: "bullseye"
-            arch: "armv7"
-          - distro: "debian"
-            release: "bullseye"
-            image: "bullseye"
-            arch: "aarch64"
           - distro: "debian"
             release: "bookworm"
             image: "bookworm"
@@ -80,14 +58,16 @@ jobs:
             release: "bookworm"
             image: "bookworm"
             arch: "aarch64"
-          - distro: "ubuntu"
-            release: "focal"
-            image: "ubuntu20.04"
-            arch: "armv7"
-          - distro: "ubuntu"
-            release: "focal"
-            image: "ubuntu20.04"
-            arch: "aarch64"
+          - distro: "debian"
+            release: "trixie"
+            image: "none"
+            arch: "none"
+            base_image: --platform=linux/arm/v7 arm32v7/debian:trixie
+          - distro: "debian"
+            release: "trixie"
+            image: "none"
+            arch: "none"
+            base_image: --platform=linux/arm64 arm64v8/debian:trixie
           - distro: "ubuntu"
             release: "jammy"
             image: "ubuntu22.04"
@@ -96,31 +76,24 @@ jobs:
             release: "jammy"
             image: "ubuntu22.04"
             arch: "aarch64"
-          - distro: "raspbian"
-            release: "buster"
-            image: "buster"
-            arch: "armv7"
-          - distro: "raspbian"
-            release: "buster"
-            image: "buster"
-            arch: "aarch64"
-          - distro: "raspbian"
-            release: "bullseye"
-            image: "bullseye"
+          - distro: "ubuntu"
+            release: "noble"
+            image: "ubuntu24.04"
             arch: "armv7"
-          - distro: "raspbian"
-            release: "bullseye"
-            image: "bullseye"
+          - distro: "ubuntu"
+            release: "noble"
+            image: "ubuntu24.04"
             arch: "aarch64"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v2.8.1
+      - uses: uraimo/run-on-arch-action@v3
         name: Build artifact
         id: build
         with:
           arch: ${{ matrix.arch }}
           distro: ${{ matrix.image }}
+          base_image: ${{ matrix.base_image }}
           shell: /bin/bash
           install: |
             apt-get update