diff --git a/.github/docker/Dockerfile.glibc b/.github/docker/Dockerfile.glibc
index 97cb1be..7647dd0 100644
--- a/.github/docker/Dockerfile.glibc
+++ b/.github/docker/Dockerfile.glibc
@@ -1,4 +1,5 @@
-FROM ubuntu:bionic AS build
+ARG UBUNTU_VERSION=bionic
+FROM ubuntu:${UBUNTU_VERSION} AS build
 
 # Possible values: s390x, arm64, x64
 ARG NODE_VERSION=16.20.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5674312..90a1617 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,6 +49,7 @@ jobs:
         shell: bash
         run: |
           echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"
+          echo "ubuntu_version=$(node --print '(+process.version.slice(1).split(`.`).at(0)) > 16 ? `noble` : `bionic`')" >> "$GITHUB_OUTPUT"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -61,8 +62,9 @@ jobs:
           docker buildx create --name builder --bootstrap --use
           docker buildx build \
             --platform linux/${{ matrix.linux_arch }} \
-            --build-arg NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }} \
-            --build-arg NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }} \
+            --build-arg="NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }}" \
+            --build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
+            --build-arg="UBUNTU_VERSION=${{ steps.get_nodejs_version.outputs.ubuntu_version }}" \
             --output type=local,dest=./prebuilds,platform-split=false \
             -f ./.github/docker/Dockerfile.glibc \
             .