diff --git a/6/architectures b/6/architectures
index f6a7427404..e6e713740e 100644
--- a/6/architectures
+++ b/6/architectures
@@ -1,7 +1,7 @@
 bashbrew-arch   variants
 arm32v7  jessie,onbuild,slim,stretch
-arm64v8  jessie,onbuild,slim,stretch
+arm64v8  onbuild,slim,stretch
 amd64    jessie,alpine,onbuild,slim,stretch
 i386     jessie,onbuild,slim,stretch
-ppc64le  jessie,onbuild,slim,stretch
-s390x    jessie,onbuild,slim,stretch
+ppc64le  onbuild,slim,stretch
+s390x    onbuild,slim,stretch
diff --git a/8/architectures b/8/architectures
index 1a9b7a2dd8..bbad436cd4 100644
--- a/8/architectures
+++ b/8/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch   variants
 arm32v6  alpine
 arm32v7  jessie,onbuild,slim,stretch
-arm64v8  jessie,alpine,onbuild,slim,stretch
+arm64v8  alpine,onbuild,slim,stretch
 amd64    jessie,alpine,onbuild,slim,stretch
 i386     jessie,alpine,onbuild,slim,stretch
-ppc64le  jessie,alpine,onbuild,slim,stretch
-s390x    jessie,alpine,onbuild,slim,stretch
+ppc64le  alpine,onbuild,slim,stretch
+s390x    alpine,onbuild,slim,stretch
diff --git a/architectures b/architectures
index 16bb20a2cb..61e48194de 100644
--- a/architectures
+++ b/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch   variants
 arm32v6  alpine
 arm32v7  jessie,onbuild,slim,stretch
-arm64v8  jessie,alpine,onbuild,slim,stretch
+arm64v8  alpine,onbuild,slim,stretch
 amd64    jessie,alpine,onbuild,slim,stretch
 i386     alpine
-ppc64le  jessie,alpine,onbuild,slim,stretch
-s390x    jessie,alpine,onbuild,slim,stretch
+ppc64le  alpine,onbuild,slim,stretch
+s390x    alpine,onbuild,slim,stretch