diff --git a/zaino-serve/Cargo.toml b/zaino-serve/Cargo.toml
index a14a8fd..2310057 100644
--- a/zaino-serve/Cargo.toml
+++ b/zaino-serve/Cargo.toml
@@ -14,12 +14,12 @@ nym_poc = ["zingo-netutils", "zcash_client_backend"]
 [dependencies]
 # Zinglib and LibRustZcash:
 #
-# Only used in original nym_poc code, to be removed with creation of nym enhanced zingolib build. 
-#
-# Not to be used in production code as zingo-rpc will become a dep of zingolib and zingo-indexer now builds its onw CompactTxStreamer.
-zingo-netutils = { git = "https://github.com/idky137/zingolib.git", branch = "update_dep_for_zaino", optional = true }
+# *Only used in original nym_poc code, to be removed with creation of nym enhanced zingolib build. 
+# *Not to be used in production code.
 # zingo-netutils = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_001", optional = true }
-zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zcash_client_sqlite-0.11.2_plus_zingolabs_changes-1-g7ad60b5d5-2-g121371a08", features = ["lightwalletd-tonic"], optional = true }
+# zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zcash_client_sqlite-0.11.2_plus_zingolabs_changes-1-g7ad60b5d5-2-g121371a08", features = ["lightwalletd-tonic"], optional = true }
+zingo-netutils = { git = "https://github.com/idky137/zingolib.git", branch = "update_dep_for_zaino", optional = true }
+zcash_client_backend = { git = "https://github.com/idky137/librustzcash.git", branch = "zaino_dep_fix", features = ["lightwalletd-tonic"], optional = true }
 
 zaino-proto = { path = "../zaino-proto" }
 zaino-fetch = { path = "../zaino-fetch" }
diff --git a/zaino-testutils/Cargo.toml b/zaino-testutils/Cargo.toml
index 8e09dbb..cec68a8 100644
--- a/zaino-testutils/Cargo.toml
+++ b/zaino-testutils/Cargo.toml
@@ -16,8 +16,8 @@ zaino-fetch = { path = "../zaino-fetch" }
 zainod = { path = "../zainod" }
 
 # ZingoLib
-zingolib = { git = "https://github.com/idky137/zingolib.git", branch = "update_dep_for_zaino" }
 # zingolib = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_001" }
+zingolib = { git = "https://github.com/idky137/zingolib.git", branch = "update_dep_for_zaino" }
 
 # Miscellaneous Workspace
 tokio = { workspace = true }