diff --git a/src/sqlancer/datafusion/server/datafusion_server/Cargo.toml b/src/sqlancer/datafusion/server/datafusion_server/Cargo.toml
index f690cb52..e7cd04ed 100644
--- a/src/sqlancer/datafusion/server/datafusion_server/Cargo.toml
+++ b/src/sqlancer/datafusion/server/datafusion_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datafusion-server"
-edition = "2021"
+edition = "2024"
 description = "Standalone DataFusion server"
 license = "Apache-2.0"
 
@@ -10,45 +10,45 @@ license = "Apache-2.0"
 ahash = { version = "0.8", default-features = false, features = [
     "runtime-rng",
 ] }
-arrow = { version = "53.3.0", features = ["prettyprint"] }
-arrow-array = { version = "53.3.0", default-features = false, features = [
+arrow = { version = "57.2.0", features = ["prettyprint"] }
+arrow-array = { version = "57.2.0", default-features = false, features = [
     "chrono-tz",
 ] }
-arrow-buffer = { version = "53.3.0", default-features = false }
-arrow-flight = { version = "53.3.0", features = ["flight-sql-experimental"] }
-arrow-ipc = { version = "53.3.0", default-features = false, features = ["lz4"] }
-arrow-ord = { version = "53.3.0", default-features = false }
-arrow-schema = { version = "53.3.0", default-features = false }
-arrow-string = { version = "53.3.0", default-features = false }
-async-trait = "0.1.73"
-bytes = "1.4"
-chrono = { version = "0.4.38", default-features = false }
+arrow-buffer = { version = "57.2.0", default-features = false }
+arrow-flight = { version = "57.2.0", features = ["flight-sql-experimental"] }
+arrow-ipc = { version = "57.2.0", default-features = false, features = ["lz4"] }
+arrow-ord = { version = "57.2.0", default-features = false }
+arrow-schema = { version = "57.2.0", default-features = false }
+arrow-string = { version = "57.2.0", default-features = false }
+async-trait = "0.1.89"
+bytes = "1.11"
+chrono = { version = "0.4.43", default-features = false }
 dashmap = "6.0.1"
 # This version is for SQLancer CI run (disabled temporary for multiple newly fixed bugs)
-# datafusion = { version = "41.0.0" }
+#datafusion = { version = "52.1.0" }
 # Use following line if you want to test against the latest main branch of DataFusion
 datafusion = { git = "https://github.com/apache/datafusion.git", branch = "main" }
 env_logger = "0.11"
 futures = "0.3"
-half = { version = "2.2.1", default-features = false }
-hashbrown = { version = "0.14.5", features = ["raw"] }
+half = { version = "2.6.0", default-features = false }
+hashbrown = { version = "0.16.1" }
 log = "0.4"
 num_cpus = "1.13.0"
-object_store = { version = "0.11.0", default-features = false }
+object_store = { version = "0.12.4", default-features = false }
 parking_lot = "0.12"
-parquet = { version = "53.3.0", default-features = false, features = [
+parquet = { version = "57.2.0", default-features = false, features = [
     "arrow",
     "async",
     "object_store",
 ] }
-rand = "0.8"
+rand = "0.9"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-tokio = { version = "1.36", features = ["macros", "rt", "sync"] }
-tonic = "0.12.1"
-uuid = "1.0"
-prost = { version = "0.13.1" }
-prost-derive = "0.13.1"
+tokio = { version = "1.48", features = ["macros", "rt", "rt-multi-thread", "sync"] }
+tonic = "0.14.3"
+uuid = "1.18"
+prost = { version = "0.14.1" }
+prost-derive = "0.14.1"
 mimalloc = { version = "0.1", default-features = false }
 
 [[bin]]
diff --git a/src/sqlancer/datafusion/server/datafusion_server/src/main.rs b/src/sqlancer/datafusion/server/datafusion_server/src/main.rs
index 41b12e21..4ff007e1 100644
--- a/src/sqlancer/datafusion/server/datafusion_server/src/main.rs
+++ b/src/sqlancer/datafusion/server/datafusion_server/src/main.rs
@@ -406,9 +406,7 @@ impl FlightSqlService for FlightSqlServiceImpl {
         let plan_uuid = Uuid::new_v4().hyphenated().to_string();
         self.statements.insert(plan_uuid.clone(), plan.clone());
 
-        let plan_schema = plan.schema();
-
-        let arrow_schema = (&**plan_schema).into();
+        let arrow_schema = plan.schema().as_arrow();
         let message = SchemaAsIpc::new(&arrow_schema, &IpcWriteOptions::default())
             .try_into()
             .map_err(|e| status!("Unable to serialize schema", e))?;