diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a726ef9661..f8bb3474a8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -33,7 +33,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        base-image: [debian, 'debian:stable-slim', alpine, 'busybox:glibc', 'busybox:musl']
+        tag:
+        - alpine
+        - slim
+        - debian
+        - glibc-busybox
+        - musl-busybox
+        - musl-distroless
+        - glibc-distroless
+        - glibc
+        - musl
         include:
         - { tag: alpine,           base-image: alpine,                     arch: x86_64-unknown-linux-musl, plugin: true  }
         - { tag: slim,             base-image: 'debian:stable-slim',       arch: x86_64-unknown-linux-gnu,  plugin: true  }
diff --git a/docs/docker.md b/docs/docker.md
index 837707404c..17ed135e92 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -2,7 +2,7 @@
 
 | tag                | base image           | plugins | package manager | libs & bins                                                      | size        |
 | ------------------ | -------------------- | ------- | --------------- | ---------------------------------------------------------------- | ----------- |
-| `latest`,`debian`  | `debian:latest`      | yes     | apt             | **a lot**, including _glibc_                                     | ~(48+62) MB |
+| `latest`, `debian` | `debian:latest`      | yes     | apt             | **a lot**, including _glibc_                                     | ~(48+62) MB |
 | `slim`             | `debian:stable-slim` | yes     | apt             | all `nu:debian` image but exclude [this list][.slimify-excludes] | ~(26+62) MB |
 | `alpine`           | `alpine:latest`      | yes     | apk             | all `nu:musl-busybox` image + libcrypto, libssl, libtls, libz    | ~(3+61) MB  |
 | `musl-busybox`     | `busybox:musl`       | no      | —               | GNU utils + _musl_                                               | ~(1+16) MB  |