diff --git a/_pages/documentation/general_docs/building/index.md b/_pages/documentation/general_docs/building/index.md
index ce8174a..e9fc795 100644
--- a/_pages/documentation/general_docs/building/index.md
+++ b/_pages/documentation/general_docs/building/index.md
@@ -78,21 +78,23 @@
 For users struggling to setup an environment to build and run gem5, we provide
 the following Docker Images:
 
+Ubuntu 20.04 with all optional dependencies:
+[gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2](
+https://gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2) ([source Dockerfile](
+https://gem5.googlesource.com/public/gem5/+/refs/heads/stable/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile)).
+
+Ubuntu 20.04 with minimum dependencies:
+[gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2](
+https://gcr.io/gem5-test/ubuntu-20.04_min-dependencies:v21-2) ([source Dockerfile](
+https://gem5.googlesource.com/public/gem5/+/refs/heads/stable/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile)).
+
 Ubuntu 18.04 with all optional dependencies:
-[gcr.io/gem5-test/ubuntu-18.04_all-dependencies](
-https://gcr.io/gem5-test/ubuntu-18.04_all-dependencies) ([source Dockerfile](
+[gcr.io/gem5-test/ubuntu-18.04_all-dependencies:v21-2](
+https://gcr.io/gem5-test/ubuntu-18.04_all-dependencies:v21-2) ([source Dockerfile](
 https://gem5.googlesource.com/public/gem5/+/refs/heads/stable/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile)).
 
-Ubuntu 18.04 with the minimum set of dependencies:
-[gcr.io/gem5-test/ubuntu-18.04_min-dependencies](
-https://gcr.io/gem5-test/ubuntu-18.04_min-dependencies) ([source Dockerfile](
-https://gem5.googlesource.com/public/gem5/+/refs/heads/stable/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile)).
 
 
-Ubuntu 20.04 with all optional dependencies:
-[gcr.io/gem5-test/ubuntu-20.04_all-dependencies](
-https://gcr.io/gem5-test/ubuntu-20.04_all-dependencies) ([source Dockerfile](
-https://gem5.googlesource.com/public/gem5/+/refs/heads/stable/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile)).
 
 To obtain a docker image:
 
@@ -100,13 +102,13 @@
 docker pull <image>
 ```
 
-E.g., for Ubuntu 18.04 with all optional dependencies:
+E.g., for Ubuntu 20.04 with all optional dependencies:
 
 ```
-docker pull gcr.io/gem5-test/ubuntu-18.04_all-dependencies
+docker pull gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2
 ```
 
-Then, to work within this enviornment, we suggest using the following:
+Then, to work within this environment, we suggest using the following:
 
 ```
 docker run -u $UID:$GID --volume <gem5 directory>:/gem5 --rm -it <image>
@@ -114,7 +116,7 @@
 
 Where `<gem5 directory>` is the full path of the gem5 in your file system, and
 `<image>` is the image pulled (e.g.,
-`gcr.io/gem5-test/ubuntu-18.04_all-dependencies`).
+`gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2`).
 
 From this environment, you will be able to build and run gem5 from the `/gem5`
 directory.
diff --git a/_pages/documentation/general_docs/fullsystem/guest_binaries.md b/_pages/documentation/general_docs/fullsystem/guest_binaries.md
index 7e47216..1312f8b 100644
--- a/_pages/documentation/general_docs/fullsystem/guest_binaries.md
+++ b/_pages/documentation/general_docs/fullsystem/guest_binaries.md
@@ -25,11 +25,11 @@
 
 The tarball below contains a set of binaries: the Linux kernel and a set of bootloaders
 
-* <http://dist.gem5.org/dist/v21-1/arm/aarch-system-20210904.tar.bz2>
+* <http://dist.gem5.org/dist/v21-2/arm/aarch-system-20210904.tar.bz2>
 
 ##### Latest Linux Disk Images (**recommended**)
 
-* <http://dist.gem5.org/dist/v21-1/arm/disks/ubuntu-18.04-arm64-docker.img.bz2>
+* <http://dist.gem5.org/dist/v21-2/arm/disks/ubuntu-18.04-arm64-docker.img.bz2>
 
   Partition table: yes
 
@@ -38,7 +38,7 @@
   * kvm (using m5 --addr ops): `/init.addr.gem5`
   * fast models (using m5 --semi ops): `/init.semi.gem5`
 
-* <http://dist.gem5.org/dist/v21-1/arm/disks/aarch32-ubuntu-natty-headless.img.bz2>
+* <http://dist.gem5.org/dist/v21-2/arm/disks/aarch32-ubuntu-natty-headless.img.bz2>
 
 ##### Old Linux Kernel/Disk Image
 
diff --git a/_pages/documentation/general_docs/gem5_resources.md b/_pages/documentation/general_docs/gem5_resources.md
index 463c685..fb3ee7f 100644
--- a/_pages/documentation/general_docs/gem5_resources.md
+++ b/_pages/documentation/general_docs/gem5_resources.md
@@ -30,31 +30,13 @@
 
 ## Where can I obtain the gem5 resources?
 
-The gem5 resources are hosted on our Google Cloud Bucket. Listed below are the
-compiled resources presently available, as well as links to their sources in
-the gem5 resources repository. **These are resources sources for gem5 20.1**.
+The gem5 resources are hosted on our Google Cloud Bucket. Links to the
+resources can be found in the [gem5 resources README.md file](
+https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/README.md).
+A machine readable JSON file, containing information on the resources can be
+found [here](
+https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/resources.json).
 
-|Resource |Compiled/Built Resource |Source |
-|:--------|:-----------------------|:------|
-|asmtest | 351 test binaries, downloadable with `https://dist.gem5.org/dist/v21-1/test-progs/asmtest/bin/<binary>` | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/asmtest) |
-|riscv-tests | [dhryston.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/dhrystone.riscv), [median.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/median.riscv), [mm.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/mm.riscv), [mt-matmul.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/mt-matmul.riscv), [mt-vvadd.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/mt-vvadd.riscv), [multiply.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/multiply.riscv), [pmp.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/pmp.riscv), [qsort.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/qsort.riscv), [rsort.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/rsort.riscv), [spmv.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/spmv.riscv), [towers.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/towers.riscv), [vvadd.riscv](http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/vvadd.riscv) |[here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/riscv-tests) |
-|insttests | [insttest-rv64a](http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/riscv/linux/insttest-rv64a), [insttest-rv64c](http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/riscv/linux/insttest-rv64c), [insttest-rv64d](http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/riscv/linux/insttest-rv64d), [insttest-rv64f](http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/riscv/linux/insttest-rv64f), [insttest-rv64i](http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/riscv/linux/insttest-rv64i), [insttest-rv64m](http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/riscv/linux/insttest-rv64m) | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/insttest) |
-|simple/pthread (x86) | [test_pthread_create_seq](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_create_seq), [test_pthread_create_para](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_create_para), [test_pthread_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_mutex), [test_atomic](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_atomic), [test_pthread_cond](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_cond), [test_std_thread](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_std_thread), [test_std_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_std_mutex), [test_std_condition_variable](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_std_condition_variable) | [here (Along with other 'simple' executables)](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/simple) |
-|simple/pthread (aarch32) | [test_pthread_create_seq](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_create_seq), [test_pthread_create_para](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_create_para), [test_pthread_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_mutex), [test_atomic](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_atomic), [test_pthread_cond](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_cond), [test_std_thread](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_std_thread), [test_std_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_std_mutex), [test_std_condition_variable](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_std_condition_variable) | [here (Along with other 'simple' executables)](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/simple) |
-|simple/pthread (aarch64) | [test_pthread_create_seq](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_create_seq), [test_pthread_create_para](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_create_para), [test_pthread_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_mutex), [test_atomic](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_atomic), [test_pthread_cond](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_cond), [test_std_thread](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_std_thread), [test_std_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_std_mutex), [test_std_condition_variable](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_std_condition_variable) | [here (Along with other 'simple' executables)](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/simple) |
-|simple/pthread (riscv64) | [test_pthread_create_seq](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_create_seq), [test_pthread_create_para](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_create_para), [test_pthread_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_mutex), [test_atomic](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_atomic), [test_pthread_cond](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_cond), [test_std_thread](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_std_thread), [test_std_mutex](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_std_mutex), [test_std_condition_variable](http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_std_condition_variable) | [here (Along with other 'simple' executables)](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/simple) |
-|simple/hello| [x86 executable](https://dist.gem5.org/dist/v21-1/test-progs/hello/bin/x86/linux/hello), [arm executable](https://dist.gem5.org/dist/v21-1/test-progs/hello/bin/arm/linux/hello), [mips executable](https://dist.gem5.org/dist/v21-1/test-progs/hello/bin/mips/linux/hello), [power executable](https://dist.gem5.org/dist/v21-1/test-progs/hello/bin/power/linux/hello), [riscv executable](https://dist.gem5.org/dist/v21-1/test-progs/hello/bin/riscv/linux/hello), [sparc executable](https://dist.gem5.org/dist/v21-1/test-progs/hello/bin/sparc/linux/hello) | [here (Along with other 'simple' executables)](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/simple) |
-|simple/m5_exit | [x86 executable](https://dist.gem5.org/dist/v21-1/test-progs/m5-exit/bin/x86/linux/m5_exit) | [here (Along with other 'simple' executables)](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/simple) |
-|insttest | [insttest](https://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/sparc/linux/insttest)| [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/insttest) |
-|square | [square.o](https://dist.gem5.org/dist/v21-1/test-progs/square/square.o) | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/square) |
-|spec-2006 | --- | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/spec-2006) |
-|spec-2017 | --- | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/spec-2017) |
-|gapbs | [Disk Image (GZIPPED)](http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/gapbs.img.gz) | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/gapbs) |
-|parsec | [Disk Image (GZIPPED)](http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/parsec.img.gz) | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/parsec) |
-|npb | [Disk Image (GZIPPED)](http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/npb.img.gz) | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/npb) |
-|Linux boot-exit | [Disk Image (GZIPPED)](http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/boot-exit.img.gz) |[here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/boot-exit) |
-|hack-back| --- | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/hack-back) |
-|linux kernels | [v4.4.186](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.4.186), [v4.9.186](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.9.186), [v4.14.134](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.14.134), [v4.19.83](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.19.83), [v5.4.49](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-5.4.49) | [here](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/linux-kernel/) |
 
 ## How do I obtain the gem5 resource sources?
 
diff --git a/_pages/documentation/general_docs/gpu_models/gcn3.md b/_pages/documentation/general_docs/gpu_models/gcn3.md
index 76e300f..6a548e9 100644
--- a/_pages/documentation/general_docs/gpu_models/gcn3.md
+++ b/_pages/documentation/general_docs/gpu_models/gcn3.md
@@ -25,7 +25,7 @@
 The [gem5-resources repository](https://gem5.googlesource.com/public/gem5-resources/) also comes with a number of sample applications that can be used to verify that the model runs correctly.  We recommend users start with [square](https://resources.gem5.org/resources/square), as it is a simple, heavily tested application that should run relatively quickly.
 
 #### Using the image
-The docker image can either be built or pulled from gcr.io
+The docker image can either be built or pulled from gcr.io.
 
 To build the docker image from source:
 ```
@@ -33,17 +33,18 @@
 docker build -t <image_name> .
 ```
 
-To pull the pre-built docker image:
+To pull the pre-built docker image (Note the `v21-2` tag, to get the correct
+image for this release):
 ```
-docker pull gcr.io/gem5-test/gcn-gpu
+docker pull gcr.io/gem5-test/gcn-gpu:v21-2
 ```
-You can also put `gcr.io/gem5-test/gcn-gpu` as the image in the docker run command without pulling beforehand and it will be pulled automatically.
+You can also put `gcr.io/gem5-test/gcn-gpu:v21-2` as the image in the docker run command without pulling beforehand and it will be pulled automatically.
 
 #### Building gem5 using the image
-See square in [gem5 resources](https://resources.gem5.org/resources/square) for an example of how to build gem5 in the docker.  Note: these directions assume you are pulling the latest image automatically.
+See square in [gem5 resources](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/gpu/square/) for an example of how to build gem5 in the docker.  Note: these directions assume you are pulling the latest image automatically.
 
 #### Building & running a GPU application using the image
-See [gem5 resources](https://resources.gem5.org/) for examples of how to build and run GPU applications in the docker.
+See [gem5 resources](https://gem5.googlesource.com/public/gem5-resources/+/refs/heads/stable/src/gpu) for examples of how to build and run GPU applications in the docker.
 
 ## **ROCm**
 
diff --git a/_pages/documentation/learning_gem5/part1/part1_6_extending_configs.md b/_pages/documentation/learning_gem5/part1/part1_6_extending_configs.md
index 58019fe..23e2a89 100644
--- a/_pages/documentation/learning_gem5/part1/part1_6_extending_configs.md
+++ b/_pages/documentation/learning_gem5/part1/part1_6_extending_configs.md
@@ -22,8 +22,8 @@
 ```
 mkdir -p cpu_tests/benchmarks/bin/arm
 cd cpu_tests/benchmarks/bin/arm
-wget dist.gem5.org/dist/current/gem5/cpu_tests/benchmarks/bin/arm/Bubblesort
-wget dist.gem5.org/dist/current/gem5/cpu_tests/benchmarks/bin/arm/FloatMM
+wget dist.gem5.org/dist/v21-2/test-progs/cpu-tests/bin/arm/Bubblesort
+wget dist.gem5.org/dist/v21-2/test-progs/cpu-tests/bin/arm/FloatMM
 ```
 
 We'll use these to further test our ARM system.