diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 554130c..ffc8584 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,17 +26,25 @@ jobs:
               ALPINE_VERSION=3.14
             tags: |
               nightly-alpine3.14
-          - context: bullseye
+          - context: debian
+            args: |
+              DEBIAN_VERSION=bullseye
             tags: |
               nightly-bullseye
-          - context: bullseye/slim
+          - context: debian
+            args: |
+              DEBIAN_VERSION=buster
             tags: |
-              nightly-bullseye-slim
-          - context: buster
+              nightly
+              nightly-buster
+          - context: debian-slim
+            args: |
+              DEBIAN_VERSION=bullseye
             tags: |
-              value=nightly
-              value=nightly-buster
-          - context: buster/slim
+              nightly-bullseye-slim
+          - context: debian-slim
+            args: |
+              DEBIAN_VERSION=buster
             tags: |
               nightly-slim
               nightly-buster-slim
diff --git a/buster/Dockerfile b/buster/Dockerfile
deleted file mode 100644
index b9f1274..0000000
--- a/buster/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM buildpack-deps:buster
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH
-
-RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
-    esac; \
-    \
-    url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init"; \
-    wget "$url"; \
-    chmod +x rustup-init; \
-    ./rustup-init -y --no-modify-path --default-toolchain nightly; \
-    rm rustup-init; \
-    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
-    rustup --version; \
-    cargo --version; \
-    rustc --version;
diff --git a/buster/slim/Dockerfile b/buster/slim/Dockerfile
deleted file mode 100644
index 4d7c0ec..0000000
--- a/buster/slim/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM debian:buster-slim
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH
-
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        ca-certificates \
-        gcc \
-        libc6-dev \
-        wget \
-        ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
-    esac; \
-    \
-    url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init"; \
-    wget "$url"; \
-    chmod +x rustup-init; \
-    ./rustup-init -y --no-modify-path --default-toolchain nightly; \
-    rm rustup-init; \
-    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
-    apt-get remove -y --auto-remove \
-        wget \
-        ; \
-    rm -rf /var/lib/apt/lists/*;
diff --git a/bullseye/slim/Dockerfile b/debian-slim/Dockerfile
similarity index 94%
rename from bullseye/slim/Dockerfile
rename to debian-slim/Dockerfile
index 6bea924..edf63c6 100644
--- a/bullseye/slim/Dockerfile
+++ b/debian-slim/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:bullseye-slim
+ARG DEBIAN_VERSION
+FROM debian:${DEBIAN_VERSION}-slim
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
diff --git a/bullseye/Dockerfile b/debian/Dockerfile
similarity index 92%
rename from bullseye/Dockerfile
rename to debian/Dockerfile
index 37a7952..8fba5a1 100644
--- a/bullseye/Dockerfile
+++ b/debian/Dockerfile
@@ -1,4 +1,5 @@
-FROM buildpack-deps:bullseye
+ARG DEBIAN_VERSION
+FROM buildpack-deps:${DEBIAN_VERSION}
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \