diff --git a/aqua-examples/decentralized-blockchain-gateway/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/Cargo.toml
new file mode 100644
index 0000000..3790788
--- /dev/null
+++ b/aqua-examples/decentralized-blockchain-gateway/Cargo.toml
@@ -0,0 +1,13 @@
+[workspace]
+members = [
+  "wasm-modules/curl-adapter",
+  "wasm-modules/multi-provider-query",
+  "wasm-modules/simple-quorum",
+  "wasm-modules/utilities",
+  "wasm-modules/eth-rpc",
+  "wasm-modules/ipfs-adapter",
+  "wasm-modules/ipfs-cli"
+]
+
+[profile.release]
+opt-level = "s"
diff --git a/aqua-examples/decentralized-blockchain-gateway/fluence-lock.yaml b/aqua-examples/decentralized-blockchain-gateway/fluence-lock.yaml
index 0ebd094..d5eb3ab 100644
--- a/aqua-examples/decentralized-blockchain-gateway/fluence-lock.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/fluence-lock.yaml
@@ -7,5 +7,8 @@
 version: 0
 cargo:
   marine: 0.12.5
+  mrepl: 0.18.8
 npm:
   "@fluencelabs/aqua": 0.9.4
+  "@fluencelabs/aqua-lib": 0.6.0
+  "@fluencelabs/spell": 0.0.1
diff --git a/aqua-examples/decentralized-blockchain-gateway/fluence.yaml b/aqua-examples/decentralized-blockchain-gateway/fluence.yaml
index 62d2cb1..8648a22 100644
--- a/aqua-examples/decentralized-blockchain-gateway/fluence.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/fluence.yaml
@@ -15,10 +15,6 @@ dependencies:
     marine: 0.12.5
     mrepl: 0.18.8
 services:
-  ipfs_package:
-    get: ./configs/services/ipfs-package
-    deploy:
-      - deployId: default
   multi_provider_query:
     get: configs/services/multi-provider-query
     deploy:
@@ -35,3 +31,7 @@ services:
     get: configs/services/eth-rpc
     deploy:
       - deployId: default
+  ipfs_package:
+    get: configs/services/ipfs-package
+    deploy:
+      - deployId: default
diff --git a/aqua-examples/decentralized-blockchain-gateway/gateway/config.json b/aqua-examples/decentralized-blockchain-gateway/gateway/config.json
index 6aed2a4..e92aed6 100644
--- a/aqua-examples/decentralized-blockchain-gateway/gateway/config.json
+++ b/aqua-examples/decentralized-blockchain-gateway/gateway/config.json
@@ -14,4 +14,5 @@
   "quorumNumber": 2,
   "quorumTimeout": null,
   "requestTimeout": null
-}
\ No newline at end of file
+}
+
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/Cargo.toml
index bb128bc..90ba2c9 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "curl_adapter"
+name = "curl-adapter"
 version = "0.1.0"
 authors = ["Fluence Labs"]
 edition = "2018"
@@ -7,7 +7,7 @@ publish = false
 
 [[bin]]
 path = "src/main.rs"
-name = "curl_adapter"
+name = "curl-adapter"
 
 [dependencies]
 marine-rs-sdk = "0.7.1"
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/module.yaml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/module.yaml
index 07800bc..7351e97 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/module.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/curl-adapter/module.yaml
@@ -6,6 +6,6 @@
 
 version: 0
 type: rust
-name: curl_adapter
+name: curl-adapter
 mountedBinaries:
   curl: /usr/bin/curl
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/Cargo.toml
index 2d1428b..502564f 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "eth_rpc"
+name = "eth-rpc"
 version = "0.1.0"
 edition = "2021"
 
 [[bin]]
-name = "eth_rpc"
+name = "eth-rpc"
 path = "src/main.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/module.yaml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/module.yaml
index 2b6392c..b91b461 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/module.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/eth-rpc/module.yaml
@@ -6,4 +6,4 @@
 
 version: 0
 type: rust
-name: eth_rpc
+name: eth-rpc
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/Cargo.toml
index 48fd62f..8a2e91e 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/Cargo.toml
@@ -7,7 +7,7 @@ description = "ipfs-adapter, a Marine wasi module"
 license = "Apache-2.0"
 
 [[bin]]
-name = "ipfs_adapter"
+name = "ipfs-adapter"
 path = "src/main.rs"
 
 [dependencies]
@@ -17,6 +17,3 @@ log = "0.4.14"
 [dev-dependencies]
 marine-rs-sdk-test = "0.8.2"
 
-[dev]
-[profile.release]
-opt-level = "s"
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/module.yaml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/module.yaml
index a4ea57f..ba31618 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/module.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-adapter/module.yaml
@@ -6,6 +6,6 @@
 
 version: 0
 type: rust
-name: ipfs_adapter
+name: ipfs-adapter
 mountedBinaries:
   ipfs: /usr/bin/ipfs
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/Cargo.toml
index 1562d9e..fbbb9e2 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/Cargo.toml
@@ -7,7 +7,7 @@ description = "ipfs-cli, a Marine wasi module"
 license = "Apache-2.0"
 
 [[bin]]
-name = "ipfs_cli"
+name = "ipfs-cli"
 path = "src/main.rs"
 
 [dependencies]
@@ -18,7 +18,3 @@ serde = "1.0.137"
 
 [dev-dependencies]
 marine-rs-sdk-test = "0.8.2"
-
-[dev]
-[profile.release]
-opt-level = "s"
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/module.yaml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/module.yaml
index bd1a60c..39fb277 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/module.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/ipfs-cli/module.yaml
@@ -6,4 +6,4 @@
 
 version: 0
 type: rust
-name: ipfs_cli
+name: ipfs-cli
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/Cargo.toml
index f6ca8c4..7ce8341 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "multi_provider_query"
+name = "multi-provider-query"
 version = "0.1.0"
 edition = "2018"
 
 [[bin]]
-name = "multi_provider_query"
+name = "multi-provider-query"
 path = "src/main.rs"
 
 [dependencies]
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/module.yaml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/module.yaml
index 65dc352..14d53f6 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/module.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/multi-provider-query/module.yaml
@@ -6,4 +6,4 @@
 
 version: 0
 type: rust
-name: multi_provider_query
+name: multi-provider-query
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/Cargo.toml
index a6e674e..3f4e7c2 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/Cargo.toml
@@ -7,7 +7,7 @@ description = "simple-quorum, a Marine wasi module"
 license = "Apache-2.0"
 
 [[bin]]
-name = "simple_quorum"
+name = "simple-quorum"
 path = "src/main.rs"
 
 [dependencies]
@@ -20,6 +20,3 @@ streaming-stats = "0.2.3"
 [dev-dependencies]
 marine-rs-sdk-test = "0.8.2"
 
-[dev]
-[profile.release]
-opt-level = "s"
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/module.yaml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/module.yaml
index a64b8eb..5526c41 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/module.yaml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/simple-quorum/module.yaml
@@ -6,4 +6,4 @@
 
 version: 0
 type: rust
-name: simple_quorum
+name: simple-quorum
diff --git a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/utilities/Cargo.toml b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/utilities/Cargo.toml
index 653a91d..10dabad 100644
--- a/aqua-examples/decentralized-blockchain-gateway/wasm-modules/utilities/Cargo.toml
+++ b/aqua-examples/decentralized-blockchain-gateway/wasm-modules/utilities/Cargo.toml
@@ -20,6 +20,3 @@ streaming-stats = "0.2.3"
 [dev-dependencies]
 marine-rs-sdk-test = "0.8.2"
 
-[dev]
-[profile.release]
-opt-level = "s"