diff --git a/tests/docker/src/lib.rs b/tests/docker/src/lib.rs
index e5b675b5..48dfcffd 100644
--- a/tests/docker/src/lib.rs
+++ b/tests/docker/src/lib.rs
@@ -9,7 +9,7 @@ use std::{
 use tokio::{sync::Mutex, process::Command};
 
 static BUILT: OnceLock<Mutex<HashMap<String, Arc<Mutex<bool>>>>> = OnceLock::new();
-pub async fn build(name: String) {
+async fn build_inner(name: String) {
   let built = BUILT.get_or_init(|| Mutex::new(HashMap::new()));
   // Only one call to build will acquire this lock
   let mut built_lock = built.lock().await;
@@ -202,6 +202,11 @@ pub async fn build(name: String) {
 
   println!("Built!");
 
+  // Set built
+  *built_lock = true;
+}
+
+async fn clear_cache_if_github() {
   if std::env::var("GITHUB_CI").is_ok() {
     println!("In CI, so clearing cache to prevent hitting the storage limits.");
     if !Command::new("docker")
@@ -215,20 +220,23 @@ pub async fn build(name: String) {
       .status
       .success()
     {
-      println!("failed to clear cache after building {name}\n");
+      println!("failed to clear cache\n");
     }
   }
+}
 
-  // Set built
-  *built_lock = true;
+pub async fn build(name: String) {
+  build_inner(name).await;
+  clear_cache_if_github().await;
 }
 
 pub async fn build_batch(names: Vec<String>) {
   let mut handles = vec![];
   for name in names.into_iter().collect::<HashSet<_>>() {
-    handles.push(tokio::spawn(build(name)));
+    handles.push(tokio::spawn(build_inner(name)));
   }
   for handle in handles {
     handle.await.unwrap();
   }
+  clear_cache_if_github().await;
 }
diff --git a/tests/full-stack/src/lib.rs b/tests/full-stack/src/lib.rs
index 521c560d..d00d057c 100644
--- a/tests/full-stack/src/lib.rs
+++ b/tests/full-stack/src/lib.rs
@@ -32,13 +32,21 @@ pub struct Handles {
 }
 
 pub async fn full_stack(name: &str) -> (Handles, Vec<TestBodySpecification>) {
-  let mut docker_names = serai_processor_tests::docker_names(NetworkId::Bitcoin);
-  docker_names.append(&mut serai_processor_tests::docker_names(NetworkId::Monero));
-  docker_names.extend([
+  let mut processor_docker_names = serai_processor_tests::docker_names(NetworkId::Bitcoin);
+  processor_docker_names.extend(serai_processor_tests::docker_names(NetworkId::Monero));
+
+  let mut docker_names = vec![
     serai_message_queue_tests::docker_name(),
     serai_coordinator_tests::serai_docker_name(),
     serai_coordinator_tests::coordinator_docker_name(),
-  ]);
+  ];
+
+  // If this is in the GH CI, build in two stages so we don't hit storage limits
+  if std::env::var("GITHUB_CI").is_ok() {
+    serai_docker_tests::build_batch(processor_docker_names).await;
+  } else {
+    docker_names.extend(processor_docker_names);
+  }
   serai_docker_tests::build_batch(docker_names).await;
 
   let (coord_key, message_queue_keys, message_queue_composition) = message_queue_instance().await;