diff --git a/.github/workflows/docker_reuse.yml b/.github/workflows/docker_reuse.yml
index 6ed9e6be61..956b5a7dd3 100644
--- a/.github/workflows/docker_reuse.yml
+++ b/.github/workflows/docker_reuse.yml
@@ -30,12 +30,12 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          # - [self-hosted, Linux]
+          - [self-hosted, Linux]
           - [self-hosted, macOS]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Add homebrew to PATH
-        # should be conditional on macos!
+        if: ${{ contains(matrix.os, 'macOS')  }}
         # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#adding-a-system-path
         run: echo "/opt/homebrew/bin" >> "$GITHUB_PATH"
       - name: Check out the repo
diff --git a/docker/Dockerfile.complex b/docker/Dockerfile.complex
index 1528f5c4ac..4c41c84177 100644
--- a/docker/Dockerfile.complex
+++ b/docker/Dockerfile.complex
@@ -1,6 +1,6 @@
 # DockerFile for Firedrake in complex mode with a full set of capabilities.
 
-FROM firedrakeproject/firedrake-env:latest
+FROM firedrakeproject/firedrake-env:testing
 
 USER firedrake
 WORKDIR /home/firedrake
diff --git a/docker/Dockerfile.docdeps b/docker/Dockerfile.docdeps
index 8339962262..167c24fb3c 100644
--- a/docker/Dockerfile.docdeps
+++ b/docker/Dockerfile.docdeps
@@ -1,6 +1,6 @@
 # DockerFile for Firedrake with a full set of capabilities and applications installed.
 
-FROM firedrakeproject/firedrake-vanilla:latest
+FROM firedrakeproject/firedrake-vanilla:testing
 
 USER root
 WORKDIR /home/firedrake
diff --git a/docker/Dockerfile.firedrake b/docker/Dockerfile.firedrake
index 490a16e59f..e7c5360059 100644
--- a/docker/Dockerfile.firedrake
+++ b/docker/Dockerfile.firedrake
@@ -1,6 +1,6 @@
 # DockerFile for Firedrake with a full set of capabilities and applications installed.
 
-FROM firedrakeproject/firedrake-vanilla:latest
+FROM firedrakeproject/firedrake-vanilla:testing
 
 USER firedrake
 WORKDIR /home/firedrake
diff --git a/docker/Dockerfile.jupyter b/docker/Dockerfile.jupyter
index 5f36e75672..66295480d3 100644
--- a/docker/Dockerfile.jupyter
+++ b/docker/Dockerfile.jupyter
@@ -1,6 +1,6 @@
 # DockerFile for a firedrake + jupyter container
 
-FROM firedrakeproject/firedrake:latest
+FROM firedrakeproject/firedrake:testing
 
 USER firedrake
 WORKDIR /home/firedrake
diff --git a/docker/Dockerfile.vanilla b/docker/Dockerfile.vanilla
index 2de26b1916..e84b5b9fe0 100644
--- a/docker/Dockerfile.vanilla
+++ b/docker/Dockerfile.vanilla
@@ -1,6 +1,6 @@
 # DockerFile for a plain Firedrake suitable for testing Firedrake components and applications
 
-FROM firedrakeproject/firedrake-env:latest
+FROM firedrakeproject/firedrake-env:testing
 
 USER firedrake
 WORKDIR /home/firedrake