diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6673a7c3c0..ba2fbe8109 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
           name: dojo-bins
           path: /tmp/bins
       - run: |
-          bash scripts/build_spawn_and_move.sh /tmp/bins/sozo
+          bash scripts/build_cairo_projects.sh /tmp/bins/sozo
           tar -xzf spawn-and-move-db.tar.gz -C /tmp/
           tar -xzf types-test-db.tar.gz -C /tmp/
           chmod +x /tmp/bins/katana
diff --git a/crates/dojo-core/Scarb.toml b/crates/dojo-core/Scarb.toml
index 168c57e743..dd8d63da39 100644
--- a/crates/dojo-core/Scarb.toml
+++ b/crates/dojo-core/Scarb.toml
@@ -6,9 +6,7 @@ name = "dojo"
 version = "1.0.0-alpha.4"
 
 [dependencies]
-# Rev points to support for Cairo 2.7.0-rc.3 without any tag yet. Should be
-# updated once a release is cut with `2.7.0-rc.3` support in it.
-dojo_plugin = { git = "https://github.com/dojoengine/dojo", rev = "71b1f1a4" }
+dojo_plugin = { git = "https://github.com/dojoengine/dojo", rev = "f15def33" }
 starknet = "=2.7.0"
 
 [lib]
diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock
index dc899a1de1..ae6ec350d2 100644
--- a/crates/torii/types-test/Scarb.lock
+++ b/crates/torii/types-test/Scarb.lock
@@ -10,8 +10,8 @@ dependencies = [
 
 [[package]]
 name = "dojo_plugin"
-version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?rev=71b1f1a4#71b1f1a467534cbeeb901356f41e612ed4187bd1"
+version = "1.0.0-alpha.4"
+source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
 
 [[package]]
 name = "types_test"
diff --git a/crates/torii/types-test/src/contracts.cairo b/crates/torii/types-test/src/contracts.cairo
index 6147526b07..6d2b154d9a 100644
--- a/crates/torii/types-test/src/contracts.cairo
+++ b/crates/torii/types-test/src/contracts.cairo
@@ -120,8 +120,8 @@ mod records {
                     RecordLogged { record_id, type_u8: record_idx.into(), type_felt, random_u128 }
                 );
             };
-            return ();
         }
+
         // Implemment fn delete, input param: record_id
         fn delete(ref world: IWorldDispatcher, record_id: u32) {
             let world = self.world_dispatcher.read();
diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock
index a5f10a3aae..7a80ac1c79 100644
--- a/examples/spawn-and-move/Scarb.lock
+++ b/examples/spawn-and-move/Scarb.lock
@@ -33,5 +33,5 @@ dependencies = [
 
 [[package]]
 name = "dojo_plugin"
-version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?rev=71b1f1a4#71b1f1a467534cbeeb901356f41e612ed4187bd1"
+version = "1.0.0-alpha.4"
+source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
diff --git a/scripts/build_spawn_and_move.sh b/scripts/build_cairo_projects.sh
old mode 100755
new mode 100644
similarity index 67%
rename from scripts/build_spawn_and_move.sh
rename to scripts/build_cairo_projects.sh
index a079452de4..f3bb634f59
--- a/scripts/build_spawn_and_move.sh
+++ b/scripts/build_cairo_projects.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# usage: bash scripts/build_cairo_projects.sh <sozo_path>
 sozo_path=$1
 
 # Re-run the minimal tests, this will re-build the projects + generate the build artifacts.
 $sozo_path build --manifest-path examples/spawn-and-move/Scarb.toml
 $sozo_path build --manifest-path examples/spawn-and-move/Scarb.toml -P release
+$sozo_path build --manifest-path crates/torii/types-test/Scarb.toml
diff --git a/xtask/generate-test-db/src/main.rs b/xtask/generate-test-db/src/main.rs
index c12a53f873..d03ed4f2b0 100644
--- a/xtask/generate-test-db/src/main.rs
+++ b/xtask/generate-test-db/src/main.rs
@@ -57,8 +57,8 @@ async fn main() -> Result<()> {
     let spawn_and_move_compressed_path = "spawn-and-move-db.tar.gz";
     let types_test_compressed_path = "types-test-db.tar.gz";
 
-    let _ = fs::remove_dir_all(&spawn_and_move_compressed_path);
-    let _ = fs::remove_dir_all(&types_test_compressed_path);
+    let _ = fs::remove_dir_all(spawn_and_move_compressed_path);
+    let _ = fs::remove_dir_all(types_test_compressed_path);
 
     // Ensures the db-dir is clean before we start to not include old data.
     // `let _` is used to ignore the result of the remove_dir_all call as it may fail if the