diff --git a/.github/workflows/.build.yml b/.github/workflows/.build.yml
index 7aecc5cd..7d31bb6e 100644
--- a/.github/workflows/.build.yml
+++ b/.github/workflows/.build.yml
@@ -13,7 +13,7 @@ on:
       release:
         required: false
         type: string
-      distro:
+      distros:
         required: false
         type: string
 
@@ -38,12 +38,19 @@ jobs:
         env:
           INPUT_NAME: ${{ inputs.name }}
           INPUT_RELEASE: ${{ inputs.release }}
-          INPUT_DISTRO: ${{ inputs.distro }}
+          INPUT_DISTROS: ${{ inputs.distros }}
         with:
           script: |
             const inpName = core.getInput('name');
             const inpRelease = core.getInput('release');
-            const inpDistro = core.getInput('distro');
+            const inpDistros = core.getInput('distros');
+            let distroFilter = [];
+            if (inpDistros) {
+              distroFilter = inpDistros
+                .split(',')
+                .map(d => d.trim())
+                .filter(d => d !== '');
+            }
             
             if (inpRelease !== '' && !['pushonly', 'draft', 'prerelease', 'release'].includes(inpRelease)) {
               throw new Error(`Invalid release type: ${inpRelease}`);
@@ -73,7 +80,8 @@ jobs:
                 const pkgName = match[1];
                 const distro = match[2];
                 // Skip distros that don't match the input distro filter
-                if (inpDistro !== '' && distro !== inpDistro) {
+                if (distroFilter.length > 0 && !distroFilter.includes(distro)) {
+                  core.info(`Skipping ${targetName} because it doesn't match the input distro filter`);
                   continue;
                 }
                 const target = def.target[targetName];
diff --git a/.github/workflows/release-buildx.yml b/.github/workflows/release-buildx.yml
index 10b5df13..85b337d7 100644
--- a/.github/workflows/release-buildx.yml
+++ b/.github/workflows/release-buildx.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu2204")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: buildx
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}
diff --git a/.github/workflows/release-compose.yml b/.github/workflows/release-compose.yml
index 6fdda347..d11fc869 100644
--- a/.github/workflows/release-compose.yml
+++ b/.github/workflows/release-compose.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build for'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: compose
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}
diff --git a/.github/workflows/release-containerd.yml b/.github/workflows/release-containerd.yml
index 8cbfee3d..3981d73d 100644
--- a/.github/workflows/release-containerd.yml
+++ b/.github/workflows/release-containerd.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build for'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: containerd
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}
diff --git a/.github/workflows/release-credential-helpers.yml b/.github/workflows/release-credential-helpers.yml
index e0ba6560..4b3016bf 100644
--- a/.github/workflows/release-credential-helpers.yml
+++ b/.github/workflows/release-credential-helpers.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: credential-helpers
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}
diff --git a/.github/workflows/release-docker-cli.yml b/.github/workflows/release-docker-cli.yml
index 08b5fd18..14df59c1 100644
--- a/.github/workflows/release-docker-cli.yml
+++ b/.github/workflows/release-docker-cli.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: docker-cli
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}
diff --git a/.github/workflows/release-docker-engine.yml b/.github/workflows/release-docker-engine.yml
index 7f10de85..ba75dc2f 100644
--- a/.github/workflows/release-docker-engine.yml
+++ b/.github/workflows/release-docker-engine.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: docker-engine
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}
diff --git a/.github/workflows/release-model.yml b/.github/workflows/release-model.yml
index 936a0c5e..a5a15947 100644
--- a/.github/workflows/release-model.yml
+++ b/.github/workflows/release-model.yml
@@ -25,8 +25,8 @@ on:
           - draft
           - prerelease
           - release
-      distro:
-        description: 'Single distro to build'
+      distros:
+        description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")'
         required: false
         type: string
         default: ''
@@ -44,7 +44,7 @@ jobs:
     with:
       name: model
       release: ${{ inputs.release }}
-      distro: ${{ inputs.distro }}
+      distros: ${{ inputs.distros }}
       envs: |
         PKG_REPO=${{ inputs.repo }}
         PKG_REF=${{ inputs.ref }}