diff --git a/x.py b/x.py
index faa7b6f..608e078 100755
--- a/x.py
+++ b/x.py
@@ -11,14 +11,14 @@
 
 DebianArch = namedtuple("DebianArch", ["bashbrew", "dpkg", "rust"])
 
-debian_buster_arches = [
+debian_arches = [
     DebianArch("amd64", "amd64", "x86_64-unknown-linux-gnu"),
     DebianArch("arm32v7", "armhf", "armv7-unknown-linux-gnueabihf"),
     DebianArch("arm64v8", "arm64", "aarch64-unknown-linux-gnu"),
     DebianArch("i386", "i386", "i686-unknown-linux-gnu"),
 ]
 
-debian_other_arches = [
+debian_non_buster_arches = [
     DebianArch("ppc64le", "ppc64el", "powerpc64le-unknown-linux-gnu"),
 ]
 
@@ -186,9 +186,13 @@ def generate_stackbrew_library():
                 tags.append(version_tag)
             tags.append("latest")
 
+        arches = debian_arches[:]
+        if variant != "buster":
+            arches += debian_non_buster_arches
+
         library += single_library(
                 tags,
-                map(lambda a: a.bashbrew, debian_arches),
+                map(lambda a: a.bashbrew, arches),
                 os.path.join(rust_version, variant))
 
         tags = []
@@ -202,7 +206,7 @@ def generate_stackbrew_library():
 
         library += single_library(
                 tags,
-                map(lambda a: a.bashbrew, debian_arches),
+                map(lambda a: a.bashbrew, arches),
                 os.path.join(rust_version, variant, "slim"))
 
     for version in alpine_versions: