diff --git a/Cargo.lock b/Cargo.lock
index f7e80659d..6e3429ee8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -488,39 +488,6 @@ dependencies = [
  "tracing-futures",
 ]
 
-[[package]]
-name = "async-graphql"
-version = "5.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b35ef8f9be23ee30fe1eb1cf175c689bc33517c6c6d0fd0669dade611e5ced7f"
-dependencies = [
- "async-graphql-derive 5.0.10",
- "async-graphql-parser 5.0.10",
- "async-graphql-value 5.0.10",
- "async-stream",
- "async-trait",
- "base64 0.13.1",
- "bytes",
- "fast_chemail",
- "fnv",
- "futures-util",
- "handlebars",
- "http",
- "indexmap 1.9.3",
- "mime",
- "multer",
- "num-traits",
- "once_cell",
- "pin-project-lite",
- "regex",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "static_assertions",
- "tempfile",
- "thiserror",
-]
-
 [[package]]
 name = "async-graphql"
 version = "6.0.4"
@@ -591,22 +558,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "async-graphql-derive"
-version = "5.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a0f6ceed3640b4825424da70a5107e79d48d9b2bc6318dfc666b2fc4777f8c4"
-dependencies = [
- "Inflector",
- "async-graphql-parser 5.0.10",
- "darling 0.14.4",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "thiserror",
-]
-
 [[package]]
 name = "async-graphql-derive"
 version = "6.0.4"
@@ -3397,9 +3348,9 @@ dependencies = [
 name = "fuel-indexer-graphql"
 version = "0.20.5"
 dependencies = [
- "async-graphql 5.0.10",
- "async-graphql-parser 5.0.10",
- "async-graphql-value 5.0.10",
+ "async-graphql 6.0.4",
+ "async-graphql-parser 6.0.4",
+ "async-graphql-value 6.0.4",
  "fuel-indexer-database",
  "fuel-indexer-database-types",
  "fuel-indexer-lib",
@@ -3473,8 +3424,8 @@ dependencies = [
 name = "fuel-indexer-macros"
 version = "0.20.5"
 dependencies = [
- "async-graphql-parser 5.0.10",
- "async-graphql-value 5.0.10",
+ "async-graphql-parser 6.0.4",
+ "async-graphql-value 6.0.4",
  "fuel-abi-types 0.3.0",
  "fuel-indexer-database-types",
  "fuel-indexer-lib",
diff --git a/packages/fuel-indexer-graphql-dyn/src/lib.rs b/packages/fuel-indexer-graphql-dyn/src/lib.rs
index 43a78a806..918468c7a 100644
--- a/packages/fuel-indexer-graphql-dyn/src/lib.rs
+++ b/packages/fuel-indexer-graphql-dyn/src/lib.rs
@@ -5,7 +5,7 @@ pub mod spec;
 pub mod store;
 pub mod testing;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use anyhow::anyhow;
     pub use async_trait::async_trait;
     pub use extension_trait::extension_trait;
diff --git a/packages/fuel-indexer-graphql-dyn/src/schema/mod.rs b/packages/fuel-indexer-graphql-dyn/src/schema/mod.rs
index dc978ecf9..40ae9200c 100644
--- a/packages/fuel-indexer-graphql-dyn/src/schema/mod.rs
+++ b/packages/fuel-indexer-graphql-dyn/src/schema/mod.rs
@@ -10,7 +10,7 @@ pub mod schema_builder;
 pub mod schema_type;
 pub mod schema_type_builder;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use crate::spec::*;
     pub use crate::store;
diff --git a/packages/fuel-indexer-graphql-dyn/src/schema/schema_builder.rs b/packages/fuel-indexer-graphql-dyn/src/schema/schema_builder.rs
index 7f82b9624..15c901ec6 100644
--- a/packages/fuel-indexer-graphql-dyn/src/schema/schema_builder.rs
+++ b/packages/fuel-indexer-graphql-dyn/src/schema/schema_builder.rs
@@ -25,7 +25,7 @@ impl Default for DynSchemaBuilder {
 impl DynSchemaBuilder {
     pub fn new(schema_type: &DynSchemaType, store: Arc<Mutex<dyn store::Store>>) -> Self {
         let loader = DynLoader::new(store);
-        let resolver = DynResolver::new(&schema_type, Arc::new(Mutex::new(loader)));
+        let resolver = DynResolver::new(schema_type, Arc::new(Mutex::new(loader)));
         let DynSchemaBuilder {
             mut schema,
             mut query,
diff --git a/packages/fuel-indexer-graphql-dyn/src/spec/mod.rs b/packages/fuel-indexer-graphql-dyn/src/spec/mod.rs
index ef893dd1e..e20e720e1 100644
--- a/packages/fuel-indexer-graphql-dyn/src/spec/mod.rs
+++ b/packages/fuel-indexer-graphql-dyn/src/spec/mod.rs
@@ -14,7 +14,7 @@ pub mod node;
 pub mod paging;
 pub mod query;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use async_graphql::dynamic::*;
     pub use std::{hash::Hash, str::FromStr};
diff --git a/packages/fuel-indexer-graphql-dyn/src/store/mod.rs b/packages/fuel-indexer-graphql-dyn/src/store/mod.rs
index 916aa3bc3..ff9d8bf90 100644
--- a/packages/fuel-indexer-graphql-dyn/src/store/mod.rs
+++ b/packages/fuel-indexer-graphql-dyn/src/store/mod.rs
@@ -10,7 +10,7 @@ pub mod store;
 pub mod store_type;
 pub mod store_type_builder;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use indexmap::IndexMap;
     pub use serde::{Deserialize, Serialize};
diff --git a/packages/fuel-indexer-graphql-dyn/src/testing/mod.rs b/packages/fuel-indexer-graphql-dyn/src/testing/mod.rs
index 4a2103044..eea708368 100644
--- a/packages/fuel-indexer-graphql-dyn/src/testing/mod.rs
+++ b/packages/fuel-indexer-graphql-dyn/src/testing/mod.rs
@@ -3,7 +3,7 @@ pub mod schema_type;
 pub mod store;
 pub mod store_type;
 
-pub(self) mod self_prelude {
+pub mod self_prelude {
     pub use super::super::self_prelude::*;
     pub use indexmap::IndexMap;
     pub use lazy_static::lazy_static;
diff --git a/packages/fuel-indexer-graphql/Cargo.toml b/packages/fuel-indexer-graphql/Cargo.toml
index af0774798..6566ef821 100644
--- a/packages/fuel-indexer-graphql/Cargo.toml
+++ b/packages/fuel-indexer-graphql/Cargo.toml
@@ -10,9 +10,9 @@ rust-version = { workspace = true }
 description = "Fuel Indexer GraphQL"
 
 [dependencies]
-async-graphql = { version = "5.0", features = ["dynamic-schema"] }
-async-graphql-parser = "5.0"
-async-graphql-value = "5.0"
+async-graphql = { workspace = true, features = ["dynamic-schema"] }
+async-graphql-parser = { workspace = true }
+async-graphql-value = { workspace = true }
 fuel-indexer-database = { workspace = true }
 fuel-indexer-database-types = { workspace = true }
 fuel-indexer-schema = { workspace = true, features = ["db-models"] }
diff --git a/packages/fuel-indexer-macros/Cargo.toml b/packages/fuel-indexer-macros/Cargo.toml
index 6a193bc45..3089845a4 100644
--- a/packages/fuel-indexer-macros/Cargo.toml
+++ b/packages/fuel-indexer-macros/Cargo.toml
@@ -13,8 +13,8 @@ description = "Fuel Indexer Macros"
 proc-macro = true
 
 [dependencies]
-async-graphql-parser = "5.0"
-async-graphql-value = "5.0"
+async-graphql-parser = { workspace = true }
+async-graphql-value = { workspace = true }
 fuel-abi-types = "0.3"
 fuel-indexer-database-types = { workspace = true }
 fuel-indexer-lib = { workspace = true, default-features = true }