diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml
index 0952f66..b7b87f7 100644
--- a/.github/workflows/build_docker_images.yml
+++ b/.github/workflows/build_docker_images.yml
@@ -31,14 +31,18 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
+        include:
+          # Native Arm runners build both Arm platforms without QEMU
+          - platform: linux/amd64
+            runner: ubuntu-latest
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+          - platform: linux/arm/v7
+            runner: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v7
 
@@ -50,9 +54,6 @@ jobs:
         id: repo
         run: echo "lowercase=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT"
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
diff --git a/Dockerfile b/Dockerfile
index 6060149..63eb3f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG POETRY_VERSION=2.3.2
+ARG POETRY_VERSION=2.5.1
 ARG PYTHON_VERSION=3.14
 
 FROM nanomad/poetry:${POETRY_VERSION}-python-${PYTHON_VERSION} AS builder