diff --git a/Makefile b/Makefile
index 2c4e6160e..04fdfda20 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,11 @@ OWNER?=jupyter
 # - linux/arm64
 MULTI_IMAGES:= \
 	base-notebook \
-	minimal-notebook
+	minimal-notebook \
+	r-notebook \
+	scipy-notebook
 # Images that can only be built on the amd64 architecture (aka. x86_64)
 AMD64_ONLY_IMAGES:= \
-	r-notebook \
-	scipy-notebook \
 	tensorflow-notebook \
 	datascience-notebook \
 	pyspark-notebook \
diff --git a/README.md b/README.md
index 9e5766ad2..ea2f41367 100644
--- a/README.md
+++ b/README.md
@@ -107,9 +107,9 @@ This change is tracked in the issue [#1217](https://github.com/jupyter/docker-st
 
 ## CPU Architectures
 
-All published containers support amd64 (x86_64). The base-notebook and
-minimal-notebook containers also support arm64. The ambition is to have all
-containers support both amd64 and arm64.
+All published containers support amd64 (x86_64).
+The progress on arm images is tracked in [#1019](https://github.com/jupyter/docker-stacks/issues/1019).
+The ambition is to have all containers support both amd64 and arm64.
 
 ### Caveats for arm64 images
 
diff --git a/docs/index.rst b/docs/index.rst
index c03421e59..a878c6de4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -47,9 +47,9 @@ Docker destroys the container after notebook server exit, but any files written
 CPU Architectures
 -----------------
 
-All published containers support amd64 (x86_64). The base-notebook and
-minimal-notebook containers also support arm64. The ambition is to have all
-containers support both amd64 and arm64.
+All published containers support amd64 (x86_64).
+The progress on arm images is tracked in `#1019 <https://github.com/jupyter/docker-stacks/issues/1019>`_.
+The ambition is to have all containers support both amd64 and arm64.
 
 Caveats for arm64 images
 ^^^^^^^^^^^^^^^^^^^^^^^^