diff --git a/Cargo.toml b/Cargo.toml
index 080664a0f..089baf380 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@ members = [
    "packages/fuel-indexer-tests/components/web-api",
    "packages/fuel-indexer-types",
    "plugins/forc-index",
-   "plugins/forc-postgres",
    "plugins/forc-index-tests",
+   "plugins/forc-postgres",
 ]
 default-members = [
    "packages/fuel-indexer",
diff --git a/packages/fuel-indexer/Cargo.toml b/packages/fuel-indexer/Cargo.toml
index d1b21c393..615af5a70 100644
--- a/packages/fuel-indexer/Cargo.toml
+++ b/packages/fuel-indexer/Cargo.toml
@@ -20,6 +20,7 @@ async-trait = "0.1"
 bincode = "1.3.3"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { features = ["cargo", "derive", "env"], workspace = true }
+forc-postgres = { workspace = true }
 fuel-core = { version = "0.17", optional = true }
 fuel-core-client = "0.17"
 fuel-indexer-api-server = { workspace = true, optional = true }
@@ -27,7 +28,6 @@ fuel-indexer-database = { workspace = true }
 fuel-indexer-lib = { workspace = true }
 fuel-indexer-schema = { workspace = true, features = ["db-models"] }
 fuel-indexer-types = { workspace = true }
-forc-postgres = { workspace = true }
 futures = "0.3"
 sqlx = { version = "0.6", features = ["bigdecimal"] }
 thiserror = { workspace = true }
diff --git a/plugins/forc-index/Cargo.toml b/plugins/forc-index/Cargo.toml
index 3531f20ec..14c481091 100644
--- a/plugins/forc-index/Cargo.toml
+++ b/plugins/forc-index/Cargo.toml
@@ -13,13 +13,13 @@ description = "Fuel Indexer forc plugin"
 
 actix-web = { version = "4", default-features = false, features = ["macros"] }
 anyhow = "1"
-clap = { features = ["derive", "env"] , workspace = true }
+clap = { features = ["derive", "env"], workspace = true }
 forc-postgres = { workspace = true }
 forc-tracing = { version = "0.31", default-features = false }
 forc-util = { version = "0.35.0" }
 fuel-indexer-lib = { workspace = true }
-fuel-tx = { features = ["builder"] , workspace = true }
-fuels = { default-features = false , workspace = true }
+fuel-tx = { features = ["builder"], workspace = true }
+fuels = { default-features = false, workspace = true }
 hex = "0.4.3"
 hyper-rustls = { version = "0.23", features = ["http2"] }
 indicatif = "0.17"
@@ -29,9 +29,9 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
 serde = { workspace = true }
 serde_json = "1.0.73"
 serde_yaml = "0.8"
-tokio = { features = ["macros", "rt-multi-thread", "process"] , workspace = true }
-toml = "0.5"
 tempfile = "3.4.0"
+tokio = { features = ["macros", "rt-multi-thread", "process"], workspace = true }
+toml = "0.5"
 tracing = { workspace = true }
 walkdir = "2"
 
diff --git a/plugins/forc-index/src/ops/forc_index_start.rs b/plugins/forc-index/src/ops/forc_index_start.rs
index 040d4431b..f7496b6e5 100644
--- a/plugins/forc-index/src/ops/forc_index_start.rs
+++ b/plugins/forc-index/src/ops/forc_index_start.rs
@@ -78,7 +78,9 @@ pub async fn init(command: StartCommand) -> anyhow::Result<()> {
             "postgres" => {
                 if embedded_database {
                     if postgres_host.is_some() {
-                        panic!("Cannot specify postgres host when using embedded database.");
+                        panic!(
+                            "Cannot specify postgres host when using embedded database."
+                        );
                     }
                     cmd.arg("--embedded-database");
                 }
diff --git a/plugins/forc-postgres/Cargo.toml b/plugins/forc-postgres/Cargo.toml
index 124de3822..e7a8a3df3 100644
--- a/plugins/forc-postgres/Cargo.toml
+++ b/plugins/forc-postgres/Cargo.toml
@@ -19,13 +19,13 @@ path = "src/lib.rs"
 
 [dependencies]
 anyhow = "1"
-clap = { features = ["derive", "env"] , workspace = true }
+clap = { features = ["derive", "env"], workspace = true }
 forc-tracing = { version = "0.31", default-features = false }
 fuel-indexer-lib = { workspace = true }
 home = "0.5"
 indicatif = "0.17"
 pg-embed = { version = "0.7" }
-serde = { features = ["derive"] , workspace = true }
+serde = { features = ["derive"], workspace = true }
 serde_json = { version = "1.0" }
-tokio = { features = ["macros", "rt-multi-thread", "process"] , workspace = true }
+tokio = { features = ["macros", "rt-multi-thread", "process"], workspace = true }
 tracing = { workspace = true }