diff --git a/distance-oracle/Cargo.toml b/distance-oracle/Cargo.toml
index 3f7614e3e36e6ddd85b76bf55a5df00e11bd59c1..402ce71adb0fc043c863ead6214c232b7d42a365 100644
--- a/distance-oracle/Cargo.toml
+++ b/distance-oracle/Cargo.toml
@@ -27,26 +27,31 @@ try-runtime = ["sp-distance/try-runtime", "sp-runtime/try-runtime"]
 runtime-benchmarks = []
 
 [dependencies]
+# crates.io dependencies
+log = { workspace = true }
+simple_logger = { workspace = true }
 clap = { workspace = true, features = ["derive"], optional = true }
-codec = { workspace = true }
 fnv = { workspace = true }
 hex = { workspace = true }
-log = { workspace = true }
 num-traits = { workspace = true }
 rayon = { workspace = true }
-simple_logger = { workspace = true }
-sp-core = { workspace = true }
-sp-distance = { workspace = true }
-sp-runtime = { workspace = true }
+tokio = { workspace = true, features = [
+	"rt-multi-thread",
+	"macros",
+], optional = true }
+
+# subxt
 subxt = { workspace = true, features = [
 	"substrate-compat",
 	"native",
 	"jsonrpsee",
 ] }
-tokio = { workspace = true, features = [
-	"rt-multi-thread",
-	"macros",
-], optional = true }
+
+# substrate dependencies
+codec = { workspace = true }
+sp-core = { workspace = true }
+sp-distance = { workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
 bincode = { workspace = true }
diff --git a/docker/docker-distance-entrypoint b/docker/docker-distance-entrypoint
index 3298bcdabac4570459147e8dd27434b6f949c62b..6717bcd24199c3ca2d1e99a18a7f31fa809cf597 100755
--- a/docker/docker-distance-entrypoint
+++ b/docker/docker-distance-entrypoint
@@ -9,12 +9,11 @@ if [ "$1" = -- ]; then
 else
   ORACLE_RESULT_DIR="${ORACLE_RESULT_DIR:-/distance}"
   ORACLE_EXECUTION_INTERVAL="${ORACLE_EXECUTION_INTERVAL:-1800}"
-  ORACLE_MAX_DEPTH="${ORACLE_MAX_DEPTH:-5}"
   ORACLE_RPC_URL="${ORACLE_RPC_URL:-ws://127.0.0.1:9944}"
   ORACLE_LOG_LEVEL="${ORACLE_LOG_LEVEL:-info}"
 
   while [ true ]; do
-    distance-oracle -d "$ORACLE_RESULT_DIR" -D "$ORACLE_MAX_DEPTH" -u "$ORACLE_RPC_URL" -l "$ORACLE_LOG_LEVEL"
+    distance-oracle --evaluation-result-dir "$ORACLE_RESULT_DIR" --rpc-url "$ORACLE_RPC_URL" --log "$ORACLE_LOG_LEVEL"
     echo "Waiting $ORACLE_EXECUTION_INTERVAL seconds before next execution..."
     sleep $ORACLE_EXECUTION_INTERVAL
   done