diff --git a/Cargo.lock b/Cargo.lock
index 1f6a17ccba..668941ac79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2456,7 +2456,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-macro"
 version = "0.0.1"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "cairo-lang-macro-attributes",
  "cairo-lang-macro-stable",
@@ -2466,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-macro-attributes"
 version = "0.0.1"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "quote",
  "scarb-stable-hash",
@@ -2476,7 +2476,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-macro-stable"
 version = "1.0.0"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 
 [[package]]
 name = "cairo-lang-parser"
@@ -3623,7 +3623,7 @@ dependencies = [
 [[package]]
 name = "create-output-dir"
 version = "1.0.0"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "anyhow",
  "core-foundation",
@@ -4034,16 +4034,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
 dependencies = [
- "derive_builder_macro 0.12.0",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
-dependencies = [
- "derive_builder_macro 0.20.0",
+ "derive_builder_macro",
 ]
 
 [[package]]
@@ -4058,38 +4049,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derive_builder_core"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
-dependencies = [
- "darling 0.20.10",
- "proc-macro2",
- "quote",
- "syn 2.0.71",
-]
-
 [[package]]
 name = "derive_builder_macro"
 version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
 dependencies = [
- "derive_builder_core 0.12.0",
+ "derive_builder_core",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
-dependencies = [
- "derive_builder_core 0.20.0",
- "syn 2.0.71",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -11680,8 +11649,8 @@ dependencies = [
 
 [[package]]
 name = "scarb"
-version = "2.7.0-rc.3"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+version = "2.7.0-rc.4"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -11708,7 +11677,7 @@ dependencies = [
  "create-output-dir",
  "data-encoding",
  "deno_task_shell",
- "derive_builder 0.20.0",
+ "derive_builder",
  "directories",
  "dunce",
  "fs4",
@@ -11729,7 +11698,7 @@ dependencies = [
  "redb",
  "reqwest 0.11.27",
  "scarb-build-metadata",
- "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?rev=be95601)",
+ "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4)",
  "scarb-stable-hash",
  "scarb-ui",
  "semver 1.0.23",
@@ -11759,8 +11728,8 @@ dependencies = [
 
 [[package]]
 name = "scarb-build-metadata"
-version = "2.7.0-rc.3"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+version = "2.7.0-rc.4"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "cargo_metadata",
 ]
@@ -11781,10 +11750,10 @@ dependencies = [
 [[package]]
 name = "scarb-metadata"
 version = "1.12.0"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "camino",
- "derive_builder 0.20.0",
+ "derive_builder",
  "semver 1.0.23",
  "serde",
  "serde_json",
@@ -11794,7 +11763,7 @@ dependencies = [
 [[package]]
 name = "scarb-stable-hash"
 version = "1.0.0"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "data-encoding",
  "xxhash-rust",
@@ -11803,14 +11772,14 @@ dependencies = [
 [[package]]
 name = "scarb-ui"
 version = "0.1.5"
-source = "git+https://github.com/software-mansion/scarb?rev=be95601#be956017baeeec403212f364dded449fca31d0d5"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4#88bf93564b905336e6f34e0243e30ce7ce8859ec"
 dependencies = [
  "anyhow",
  "camino",
  "clap",
  "console",
  "indicatif",
- "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?rev=be95601)",
+ "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?tag=v2.7.0-rc.4)",
  "serde",
  "serde_json",
  "tracing-core",
@@ -15108,7 +15077,7 @@ source = "git+https://github.com/cartridge-gg/wasm-webauthn?rev=972693f#972693fd
 dependencies = [
  "ciborium",
  "coset",
- "derive_builder 0.12.0",
+ "derive_builder",
  "js-sys",
  "serde",
  "serde-wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index fc9b24295b..2fd3716eab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,8 +172,8 @@ rpassword = "7.2.0"
 rstest = "0.18.2"
 rstest_reuse = "0.6.0"
 salsa = "0.16.1"
-scarb = { git = "https://github.com/software-mansion/scarb", rev = "be95601" }
-scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "be95601" }
+scarb = { git = "https://github.com/software-mansion/scarb", tag = "v2.7.0-rc.4" }
+scarb-ui = { git = "https://github.com/software-mansion/scarb", tag = "v2.7.0-rc.4" }
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
diff --git a/crates/dojo-core/Scarb.toml b/crates/dojo-core/Scarb.toml
index 762c6b26ce..5cf61dbe36 100644
--- a/crates/dojo-core/Scarb.toml
+++ b/crates/dojo-core/Scarb.toml
@@ -6,7 +6,9 @@ name = "dojo"
 version = "0.7.3"
 
 [dependencies]
-dojo_plugin = { git = "https://github.com/dojoengine/dojo", branch = "bump-cairo-2.7" }
+# 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 = "d90b52b" }
 starknet = "=2.7.0-rc.3"
 
 # Dojo core is tested with sozo, hence we need a namespace for the test
diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
index acdfdeaf4a..5e10eee472 100644
--- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
+++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock
@@ -18,4 +18,4 @@ dependencies = [
 [[package]]
 name = "dojo_plugin"
 version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?branch=bump-cairo-2.7#17bc842f2f87b6ac0472d196efc11f01a5e55add"
+source = "git+https://github.com/dojoengine/dojo?rev=d90b52b#d90b52b89749ac8af82f352dc08aa0b1378cfae6"
diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock
index cc85bcd4ee..68f04294c2 100644
--- a/examples/spawn-and-move/Scarb.lock
+++ b/examples/spawn-and-move/Scarb.lock
@@ -34,4 +34,4 @@ dependencies = [
 [[package]]
 name = "dojo_plugin"
 version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?branch=bump-cairo-2.7#88b87323e20b872cdb86eed879e96c792b6583ab"
+source = "git+https://github.com/dojoengine/dojo?rev=d90b52b#d90b52b89749ac8af82f352dc08aa0b1378cfae6"