diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 92205d8..8110fe4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -43,12 +43,21 @@ jobs:
           - arch: s390x
             dockerfile: s390x.Dockerfile
             platform: linux/s390x
+            ubuntu_version:
+              - focal
+              - noble
           - arch: aarch64
             dockerfile: Dockerfile
             platform: linux/arm64
+            ubuntu_version:
+              - focal
+              - noble
           - arch: x86_64
             dockerfile: Dockerfile
             platform: linux/amd64
+            ubuntu_version:
+              - focal
+              - noble
 
     steps:
       - name: Checkout repository
@@ -89,7 +98,7 @@ jobs:
           flavor: |
             latest=auto
             prefix=
-            suffix=-${{ matrix.arch }}
+            suffix=-${{ matrix.ubuntu_version }}-${{ matrix.arch }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -103,6 +112,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ matrix.platform }}
+          build-args: UBUNTU_VERSION=${{ matrix.ubuntu_version }}
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker