diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md
index ab1bcc963..f850cf62d 100644
--- a/certbot/CHANGELOG.md
+++ b/certbot/CHANGELOG.md
@@ -15,6 +15,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
 * Certbot will now only keep the current and 5 previous certificates in the `/etc/letsencrypt/archive` directory for each certificate lineage. Any prior certificates will be automatically deleted upon renewal. This number may be further lowered in future releases.
   * As always, users should only reference the certificate files within `/etc/letsencrypt/live` and never use `/etc/letsencrypt/archive` directly. See [Where are my certificates?](https://eff-certbot.readthedocs.io/en/stable/using.html#where-are-my-certificates) in the Certbot User Guide.
 * `certbot.configuration.NamespaceConfig.key_dir` and `.csr_dir` are now deprecated.
+* Docker build and deploy scripts now generate multiarch manifests for non-architecture-specific tags, instead of defaulting to amd64 images.
 
 ### Fixed
 
diff --git a/tools/docker/README.md b/tools/docker/README.md
index 799ddcd0b..19a69935f 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -20,12 +20,18 @@ DNS plugin Docker images to Docker Hub.
 High-level behavior
 -------------------
 
-Running `./build.sh <TAG> all && ./deploy.sh <TAG> all` causes the Docker
-images to be built and deployed to Docker Hub for all supported architectures
-where `<TAG>` is the base of the tag that should be given to the given images.
-The tag should either be `nightly` or a git version tag like `v0.34.0`. The
-given tag is only the base of the tag because the CPU architecture is also
-added to the tag.
+Running `./build.sh <TAG> all` causes the Docker images to be built for all 
+supported architectures, where `<TAG>` is the base of the tag that should be 
+given to the generated images. The tag should either be `nightly` or a git 
+version tag like `v2.2.0`. The given tag is only the base of the tag because 
+the CPU architecture is also added to the tag. For version tags above `v2.0.0`,
+Additional tags for `latest` are also generated. The generated images are stored 
+in the local docker image cache.
+
+Running `./deploy_by_arch.sh <TAG> all && ./deploy_multiarch.sh <TAG>` will 
+push the previously generated images to Docker Hub and then generate multi-arch
+manifests for easy access to the underlying images appropriate for a given 
+architecture.
 
 Configuration
 -------------
@@ -33,4 +39,4 @@ Configuration
 To run these scripts you need:
 
 1. An x86_64 machine with Docker installed and the Docker daemon running. You probably don't want to use the docker snap as these scripts have failed when using that in the past.
-2. To be logged into Docker Hub with an account able to push to the Certbot and Certbot DNS Docker images on Docker Hub.
+2. To be logged into Docker Hub with an account able to push to the Certbot and Certbot DNS Docker images on Docker Hub. Altering the value of `DOCKER_HUB_ORG` in `lib/common` will allow you to push to your own account for testing.