diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index 0066a746..6654e37e 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -16,6 +16,7 @@ jobs:
       DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
     with:
+      runs_on: ubuntu-24.04
       cross_build_args: --features openssl/vendored
       cross_max_wait_mins: 20
   
diff --git a/Dockerfile b/Dockerfile
index f53f9170..24de6418 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -135,7 +135,7 @@ RUN chmod a+x /tmp/out/bin/*
 #
 # The previous build stage from which binaries are copied is controlled by the
 # MODE ARG (see above).
-FROM alpine:3.18 AS final
+FROM ${BASE_IMG} AS final
 
 # Copy binaries from the 'source' build stage into the image we are building
 COPY --from=source /tmp/out/bin/* /usr/local/bin/
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 275dcd06..411bc702 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -5,7 +5,6 @@ pkg:
   - "krillup"
   - "krillta"
 image:
-  - "ubuntu:focal" # ubuntu/20.04
   - "ubuntu:jammy" # ubuntu/22.04
   - "ubuntu:noble" # ubuntu/24.04
   - "debian:bullseye" # debian/11
@@ -45,9 +44,6 @@ include:
   - image: "debian:bullseye"
     deb_extra_lintian_args: "--suppress-tags systemd-service-file-outside-lib"
 
-  - image: "ubuntu:focal"
-    deb_extra_lintian_args: "--suppress-tags systemd-service-file-outside-lib"
-
   # package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
   # Raspbian 11 is based.
   - pkg: "krill"