diff --git a/Cargo.lock b/Cargo.lock
index bb83ff5d9..d49f08110 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -562,7 +562,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-casm"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -578,7 +578,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-compiler"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -586,7 +586,6 @@ dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-lowering",
  "cairo-lang-parser",
- "cairo-lang-plugins",
  "cairo-lang-project",
  "cairo-lang-semantic",
  "cairo-lang-sierra",
@@ -601,7 +600,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-debug"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-utils",
 ]
@@ -609,7 +608,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-defs"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -625,7 +624,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-diagnostics"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -636,7 +635,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-eq-solver"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
@@ -645,7 +644,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-filesystem"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -658,7 +657,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-formatter"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -677,7 +676,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-language-server"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -706,7 +705,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -731,7 +730,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-parser"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -750,7 +749,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-plugins"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -768,7 +767,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-proc-macros"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -778,7 +777,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-project"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -791,7 +790,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-runner"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "ark-ff",
  "ark-secp256k1",
@@ -818,13 +817,14 @@ dependencies = [
 [[package]]
 name = "cairo-lang-semantic"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-parser",
+ "cairo-lang-plugins",
  "cairo-lang-proc-macros",
  "cairo-lang-syntax",
  "cairo-lang-utils",
@@ -841,7 +841,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-lang-utils",
@@ -865,7 +865,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-ap-change"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -878,7 +878,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-gas"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -891,7 +891,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-generator"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -914,7 +914,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-to-casm"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "assert_matches",
  "cairo-felt",
@@ -934,7 +934,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-type-size"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -943,7 +943,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-felt",
@@ -978,7 +978,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -993,7 +993,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax-codegen"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "genco",
  "xshell",
@@ -1002,7 +1002,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-plugin"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-felt",
@@ -1027,7 +1027,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-runner"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "anyhow",
  "cairo-felt",
@@ -1048,7 +1048,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-utils"
 version = "2.3.1"
-source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1"
+source = "git+https://github.com/starkware-libs/cairo?rev=3530a2284637dc2365193edb0ff466715e4584cf#3530a2284637dc2365193edb0ff466715e4584cf"
 dependencies = [
  "env_logger",
  "indexmap 2.0.0",
diff --git a/Cargo.toml b/Cargo.toml
index 20c950350..42c795464 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,19 +29,19 @@ anyhow = "1"
 assert_fs = "1"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["http2"] }
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1", features = ["env_logger"] }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "3530a2284637dc2365193edb0ff466715e4584cf", features = ["env_logger"] }
 camino = { version = "1", features = ["serde1"] }
 cargo_metadata = "0.18"
 clap = { version = "4", features = ["derive", "env", "string"] }
diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs
index 16c55e325..c4be04c6e 100644
--- a/scarb/src/compiler/db.rs
+++ b/scarb/src/compiler/db.rs
@@ -26,12 +26,7 @@ pub(crate) fn build_scarb_root_database(
         let package_id = plugin_info.package.id;
         let plugin = ws.config().cairo_plugins().fetch(package_id)?;
         let instance = plugin.instantiate()?;
-        for macro_plugin in instance.macro_plugins() {
-            b.with_macro_plugin(macro_plugin);
-        }
-        for (name, inline_macro_plugin) in instance.inline_macro_plugins() {
-            b.with_inline_macro_plugin(&name, inline_macro_plugin);
-        }
+        b.with_plugin_suite(instance.plugin_suite());
     }
 
     let mut db = b.build()?;
diff --git a/scarb/src/compiler/plugin/builtin.rs b/scarb/src/compiler/plugin/builtin.rs
index 04e8626b0..f45b07a7f 100644
--- a/scarb/src/compiler/plugin/builtin.rs
+++ b/scarb/src/compiler/plugin/builtin.rs
@@ -1,28 +1,12 @@
-use std::sync::Arc;
-
 use anyhow::Result;
-use cairo_lang_defs::plugin::{InlineMacroExprPlugin, MacroPlugin};
-use cairo_lang_starknet::inline_macros::get_dep_component::{
-    GetDepComponentMacro, GetDepComponentMutMacro,
-};
-use cairo_lang_starknet::inline_macros::selector::SelectorMacro;
-use cairo_lang_starknet::plugin::StarkNetPlugin;
-use cairo_lang_test_plugin::TestPlugin;
+use cairo_lang_defs::plugin::PluginSuite;
+use cairo_lang_starknet::starknet_plugin_suite;
+use cairo_lang_test_plugin::test_plugin_suite;
 
 use crate::compiler::plugin::{CairoPlugin, CairoPluginInstance};
 use crate::core::{PackageId, PackageName, SourceId};
 use crate::internal::to_version::ToVersion;
 
-impl CairoPluginInstance for Arc<dyn MacroPlugin> {
-    fn macro_plugins(&self) -> Vec<Arc<dyn MacroPlugin>> {
-        Vec::from_iter([self.clone()])
-    }
-
-    fn inline_macro_plugins(&self) -> Vec<(String, Arc<dyn InlineMacroExprPlugin>)> {
-        Vec::new()
-    }
-}
-
 pub struct BuiltinStarkNetPlugin;
 impl CairoPlugin for BuiltinStarkNetPlugin {
     fn id(&self) -> PackageId {
@@ -40,22 +24,8 @@ impl CairoPlugin for BuiltinStarkNetPlugin {
 
 struct BuiltinStarkNetPluginInstance;
 impl CairoPluginInstance for BuiltinStarkNetPluginInstance {
-    fn macro_plugins(&self) -> Vec<Arc<dyn MacroPlugin>> {
-        vec![Arc::new(StarkNetPlugin::default())]
-    }
-
-    fn inline_macro_plugins(&self) -> Vec<(String, Arc<dyn InlineMacroExprPlugin>)> {
-        vec![
-            (SelectorMacro::NAME.into(), Arc::new(SelectorMacro)),
-            (
-                GetDepComponentMacro::NAME.into(),
-                Arc::new(GetDepComponentMacro),
-            ),
-            (
-                GetDepComponentMutMacro::NAME.into(),
-                Arc::new(GetDepComponentMutMacro),
-            ),
-        ]
+    fn plugin_suite(&self) -> PluginSuite {
+        starknet_plugin_suite()
     }
 }
 
@@ -78,11 +48,7 @@ impl CairoPlugin for BuiltinTestPlugin {
 struct BuiltinTestPluginInstance;
 
 impl CairoPluginInstance for BuiltinTestPluginInstance {
-    fn macro_plugins(&self) -> Vec<Arc<dyn MacroPlugin>> {
-        vec![Arc::new(TestPlugin::default())]
-    }
-
-    fn inline_macro_plugins(&self) -> Vec<(String, Arc<dyn InlineMacroExprPlugin>)> {
-        Vec::new()
+    fn plugin_suite(&self) -> PluginSuite {
+        test_plugin_suite()
     }
 }
diff --git a/scarb/src/compiler/plugin/mod.rs b/scarb/src/compiler/plugin/mod.rs
index 4703edfdf..9322a00e1 100644
--- a/scarb/src/compiler/plugin/mod.rs
+++ b/scarb/src/compiler/plugin/mod.rs
@@ -1,10 +1,9 @@
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
 use std::fmt;
-use std::sync::Arc;
 
 use anyhow::{anyhow, bail, Result};
-use cairo_lang_defs::plugin::{InlineMacroExprPlugin, MacroPlugin};
+use cairo_lang_defs::plugin::PluginSuite;
 use itertools::Itertools;
 
 use crate::core::PackageId;
@@ -19,8 +18,7 @@ pub trait CairoPlugin: Sync {
 }
 
 pub trait CairoPluginInstance {
-    fn macro_plugins(&self) -> Vec<Arc<dyn MacroPlugin>>;
-    fn inline_macro_plugins(&self) -> Vec<(String, Arc<dyn InlineMacroExprPlugin>)>;
+    fn plugin_suite(&self) -> PluginSuite;
 }
 
 pub struct CairoPluginRepository {