diff --git a/Cargo.lock b/Cargo.lock
index e1b01ebfb..92dc407f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2681,14 +2681,14 @@ dependencies = [
 
 [[package]]
 name = "geo-index"
-version = "0.3.1"
-source = "git+https://github.com/wherobots/geo-index.git?branch=main#3213c162b1dfdac9effdef3083afc17261c9f6fc"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a27fb4e4ffdde62f8aa7a4165b30f6fe8e8337d35b657ebf86c98d884ee7c750"
 dependencies = [
  "bytemuck",
  "float_next_after",
  "geo",
  "geo-traits",
- "geo-types",
  "num-traits",
  "thiserror 1.0.69",
  "tinyvec",
diff --git a/Cargo.toml b/Cargo.toml
index 82ecd7967..4c7609770 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ geo-types = "0.7.17"
 geo-traits = "0.3.0"
 geo = "0.31.0"
 
-geo-index = { version = "0.3.1" }
+geo-index = { version = "0.3.2", features = ["use-geo_0_31"] }
 
 wkb = "0.9.2"
 wkt = "0.14.0"
@@ -148,7 +148,3 @@ sedona-geos = { version = "0.2.0", path = "c/sedona-geos" }
 sedona-proj = { version = "0.2.0", path = "c/sedona-proj", default-features = false }
 sedona-s2geography = { version = "0.2.0", path = "c/sedona-s2geography" }
 sedona-tg = { version = "0.2.0", path = "c/sedona-tg" }
-
-[patch.crates-io]
-# TODO: remove this once changes we made to the geo-index crate are merged to upstream and released
-geo-index = { git = "https://github.com/wherobots/geo-index.git", branch = "main" }
diff --git a/rust/sedona-spatial-join/src/index/knn_adapter.rs b/rust/sedona-spatial-join/src/index/knn_adapter.rs
index 519d7137c..c7f96de9d 100644
--- a/rust/sedona-spatial-join/src/index/knn_adapter.rs
+++ b/rust/sedona-spatial-join/src/index/knn_adapter.rs
@@ -19,7 +19,7 @@ use once_cell::sync::OnceCell;
 use std::sync::Arc;
 
 use datafusion_execution::memory_pool::{MemoryConsumer, MemoryPool, MemoryReservation};
-use geo_index::rtree::{distance::GeometryAccessor, EuclideanDistance, HaversineDistance};
+use geo_index::rtree::distance::{EuclideanDistance, GeometryAccessor, HaversineDistance};
 use geo_types::Geometry;
 use sedona_geo::to_geo::item_to_geometry;