diff --git a/10/architectures b/10/architectures
new file mode 100644
index 000000000..4b3c4e3cd
--- /dev/null
+++ b/10/architectures
@@ -0,0 +1,8 @@
+bashbrew-arch   variants
+arm32v6  alpine
+arm32v7  jessie,onbuild,slim,stretch
+arm64v8  alpine,onbuild,stretch
+amd64    jessie,alpine,onbuild,slim,stretch
+i386     alpine
+ppc64le  alpine,onbuild,stretch
+s390x    alpine,onbuild,stretch
diff --git a/6/architectures b/6/architectures
index e6e713740..f878f384a 100644
--- a/6/architectures
+++ b/6/architectures
@@ -1,7 +1,7 @@
 bashbrew-arch   variants
 arm32v7  jessie,onbuild,slim,stretch
-arm64v8  onbuild,slim,stretch
+arm64v8  stretch
 amd64    jessie,alpine,onbuild,slim,stretch
 i386     jessie,onbuild,slim,stretch
-ppc64le  onbuild,slim,stretch
-s390x    onbuild,slim,stretch
+ppc64le  stretch
+s390x    stretch
diff --git a/8/architectures b/8/architectures
index bbad436cd..44e35db23 100644
--- a/8/architectures
+++ b/8/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch   variants
 arm32v6  alpine
 arm32v7  jessie,onbuild,slim,stretch
-arm64v8  alpine,onbuild,slim,stretch
+arm64v8  alpine,stretch
 amd64    jessie,alpine,onbuild,slim,stretch
 i386     jessie,alpine,onbuild,slim,stretch
-ppc64le  alpine,onbuild,slim,stretch
-s390x    alpine,onbuild,slim,stretch
+ppc64le  alpine,stretch
+s390x    alpine,stretch