diff --git a/Cargo.lock b/Cargo.lock
index 5075414..cac411d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -736,8 +736,9 @@ dependencies = [
 
 [[package]]
 name = "datafusion"
-version = "4.0.0-SNAPSHOT"
-source = "git+https://github.com/houqp/arrow-datafusion.git?rev=4ddd2f5e7582ffe662aea27bbb74c58cd0715152#4ddd2f5e7582ffe662aea27bbb74c58cd0715152"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aab48ee19b13cfe7523ae84ec203a1ca05ce1fda52f1ac0e45d87df90c548732"
 dependencies = [
  "ahash",
  "arrow",
@@ -2196,7 +2197,6 @@ dependencies = [
  "actix-service",
  "actix-web",
  "anyhow",
- "arrow",
  "clap",
  "columnq",
  "env_logger",
diff --git a/columnq-cli/Cargo.toml b/columnq-cli/Cargo.toml
index f2340e9..cef2971 100644
--- a/columnq-cli/Cargo.toml
+++ b/columnq-cli/Cargo.toml
@@ -9,7 +9,7 @@ name = "columnq"
 path = "src/main.rs"
 
 [dependencies]
-columnq = { path = "../columnq" }
+columnq = { path = "../columnq", version = "0" }
 
 serde_json = "*"
 log = "0"
diff --git a/columnq/Cargo.toml b/columnq/Cargo.toml
index 2302ee7..0c55499 100644
--- a/columnq/Cargo.toml
+++ b/columnq/Cargo.toml
@@ -11,8 +11,8 @@ path = "src/lib.rs"
 [dependencies]
 arrow = "5"
 parquet = "5"
-# datafusion = "5"
-datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "4ddd2f5e7582ffe662aea27bbb74c58cd0715152" }
+datafusion = "5"
+# datafusion = { git = "https://github.com/houqp/arrow-datafusion.git", rev = "4ddd2f5e7582ffe662aea27bbb74c58cd0715152" }
 
 log = "0"
 regex = "1"
diff --git a/columnq/src/error.rs b/columnq/src/error.rs
index e86d47f..7804cde 100644
--- a/columnq/src/error.rs
+++ b/columnq/src/error.rs
@@ -1,5 +1,6 @@
 use std::fmt;
 
+use datafusion::arrow;
 use datafusion::error::DataFusionError;
 use uriparse::uri_reference::URIReferenceError;
 
diff --git a/roapi-http/Cargo.toml b/roapi-http/Cargo.toml
index ef33372..a5998a0 100644
--- a/roapi-http/Cargo.toml
+++ b/roapi-http/Cargo.toml
@@ -13,8 +13,7 @@ name = "roapi-http"
 path = "src/main.rs"
 
 [dependencies]
-columnq = { path = "../columnq" }
-arrow  = "5"
+columnq = { path = "../columnq", version = "0" }
 
 # all actix dependencies are patched to use git source until actix-web 4.x lands
 actix-web = "4.0.0-beta.4"
diff --git a/roapi-http/src/api/mod.rs b/roapi-http/src/api/mod.rs
index 6e40e48..2682cf1 100644
--- a/roapi-http/src/api/mod.rs
+++ b/roapi-http/src/api/mod.rs
@@ -1,6 +1,7 @@
 use std::convert::TryFrom;
 
 use actix_web::{http, HttpRequest, HttpResponse};
+use columnq::datafusion::arrow;
 use columnq::encoding;
 use columnq::ColumnQ;
 use log::info;
diff --git a/roapi-http/src/error.rs b/roapi-http/src/error.rs
index ea12672..1e15958 100644
--- a/roapi-http/src/error.rs
+++ b/roapi-http/src/error.rs
@@ -1,6 +1,7 @@
 use std::fmt;
 
 use actix_web::{http, HttpResponse};
+use columnq::datafusion::arrow;
 use columnq::error::QueryError;
 use serde::Serializer;
 use serde_derive::Serialize;