diff --git a/Cargo.lock b/Cargo.lock
index 6d54927f..7b02315c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6225,9 +6225,9 @@ dependencies = [
 
 [[package]]
 name = "surrealkv"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5fe193207896e6eeb445b88b810830097a9940058174bbbe8ec5597b1f52e1"
+checksum = "40ac63abeb621f728a556d63004756b70ff6dd9b9805c4d8e2e26c16bbed6097"
 dependencies = [
  "ahash 0.8.11",
  "async-channel 2.2.0",
@@ -6239,7 +6239,6 @@ dependencies = [
  "parking_lot",
  "quick_cache 0.6.2",
  "revision 0.7.1",
- "sha2",
  "tokio",
  "vart",
 ]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index daf60a01..3df0dd27 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -58,7 +58,9 @@ ammonia = "4.0.0"
 arbitrary = { version = "1.3.2", features = ["derive"], optional = true }
 argon2 = "0.5.2"
 ascii = { version = "0.3.2", package = "any_ascii" }
-async-graphql = { version = "7.0.9", default-features = false, features = ["dynamic-schema"] }
+async-graphql = { version = "7.0.9", default-features = false, features = [
+    "dynamic-schema",
+] }
 base64 = "0.21.5"
 bcrypt = "0.15.0"
 bincode = "1.3.3"
@@ -146,7 +148,7 @@ snap = "1.1.0"
 storekey = "0.5.0"
 subtle = "2.6"
 surrealcs = { version = "0.3.1", optional = true }
-surrealkv = { version = "0.3.4", optional = true }
+surrealkv = { version = "0.3.6", optional = true }
 surrealml = { version = "0.1.1", optional = true, package = "surrealml-core" }
 tempfile = { version = "3.10.1", optional = true }
 thiserror = "1.0.63"
diff --git a/core/src/kvs/mod.rs b/core/src/kvs/mod.rs
index 3fa9e61e..46429b7d 100644
--- a/core/src/kvs/mod.rs
+++ b/core/src/kvs/mod.rs
@@ -43,7 +43,6 @@ mod index;
 	feature = "kv-tikv",
 	feature = "kv-fdb",
 	feature = "kv-indxdb",
-	feature = "kv-surrealkv",
 	feature = "kv-surrealcs",
 ))]
 mod savepoint;
diff --git a/core/src/kvs/surrealkv/mod.rs b/core/src/kvs/surrealkv/mod.rs
index 640469d3..c635fa50 100644
--- a/core/src/kvs/surrealkv/mod.rs
+++ b/core/src/kvs/surrealkv/mod.rs
@@ -2,7 +2,6 @@
 
 use crate::err::Error;
 use crate::key::debug::Sprintable;
-use crate::kvs::savepoint::{SaveOperation, SavePointImpl, SavePoints, SavePrepare};
 use crate::kvs::Check;
 use crate::kvs::Key;
 use crate::kvs::Val;
@@ -27,8 +26,6 @@ pub struct Transaction {
 	check: Check,
 	/// The underlying datastore transaction
 	inner: Tx,
-	/// The save point implementation
-	save_points: SavePoints,
 }
 
 impl Drop for Transaction {
@@ -88,7 +85,6 @@ impl Datastore {
 				check,
 				write,
 				inner,
-				save_points: Default::default(),
 			}),
 			Err(e) => Err(Error::Tx(e.to_string())),
 		}
@@ -197,22 +193,10 @@ impl super::api::Transaction for Transaction {
 		if !self.write {
 			return Err(Error::TxReadonly);
 		}
-		// Extract the key
-		let key = key.into();
-		// Prepare the savepoint if any
-		let prep = if self.save_points.is_some() {
-			self.save_point_prepare(&key, version, SaveOperation::Set).await?
-		} else {
-			None
-		};
 		// Set the key
 		match version {
-			Some(ts) => self.inner.set_at_ts(&key, &val.into(), ts)?,
-			None => self.inner.set(&key, &val.into())?,
-		}
-		// Confirm the save point
-		if let Some(prep) = prep {
-			self.save_points.save(prep);
+			Some(ts) => self.inner.set_at_ts(&key.into(), &val.into(), ts)?,
+			None => self.inner.set(&key.into(), &val.into())?,
 		}
 		// Return result
 		Ok(())
@@ -236,32 +220,14 @@ impl super::api::Transaction for Transaction {
 		// Get the arguments
 		let key = key.into();
 		let val = val.into();
-		// Hydrate the savepoint if any
-		let prep = if self.save_points.is_some() {
-			self.save_point_prepare(&key, version, SaveOperation::Put).await?
-		} else {
-			None
-		};
 		// Set the key if empty
 		if let Some(ts) = version {
 			self.inner.set_at_ts(&key, &val, ts)?;
 		} else {
-			// Does the key exists?
-			let key_exists = if let Some(SavePrepare::NewKey(_, sv)) = &prep {
-				sv.get_val().is_some()
-			} else {
-				self.inner.get(&key)?.is_some()
-			};
-			// If the key exist we return an error
-			if key_exists {
-				return Err(Error::TxKeyAlreadyExists);
+			match self.inner.get(&key)? {
+				None => self.inner.set(&key, &val)?,
+				_ => return Err(Error::TxKeyAlreadyExists),
 			}
-			// Set the key/value
-			self.inner.set(&key, &val)?;
-		}
-		// Confirm the save point
-		if let Some(prep) = prep {
-			self.save_points.save(prep);
 		}
 		// Return result
 		Ok(())
@@ -286,28 +252,12 @@ impl super::api::Transaction for Transaction {
 		let key = key.into();
 		let val = val.into();
 		let chk = chk.map(Into::into);
-		// Hydrate the savepoint if any
-		let prep = if self.save_points.is_some() {
-			self.save_point_prepare(&key, None, SaveOperation::Put).await?
-		} else {
-			None
-		};
-		// Does the key exists?
-		let current_val = if let Some(SavePrepare::NewKey(_, sv)) = &prep {
-			sv.get_val().cloned()
-		} else {
-			self.inner.get(&key)?
-		};
 		// Set the key if valid
-		match (current_val, chk) {
+		match (self.inner.get(&key)?, chk) {
 			(Some(v), Some(w)) if v == w => self.inner.set(&key, &val)?,
 			(None, None) => self.inner.set(&key, &val)?,
 			_ => return Err(Error::TxConditionNotMet),
 		};
-		// Confirm the save point
-		if let Some(prep) = prep {
-			self.save_points.save(prep);
-		}
 		// Return result
 		Ok(())
 	}
@@ -326,20 +276,8 @@ impl super::api::Transaction for Transaction {
 		if !self.write {
 			return Err(Error::TxReadonly);
 		}
-		// Extract the key
-		let key = key.into();
-		// Hydrate the savepoint if any
-		let prep = if self.save_points.is_some() {
-			self.save_point_prepare(&key, None, SaveOperation::Del).await?
-		} else {
-			None
-		};
 		// Remove the key
-		self.inner.delete(&key)?;
-		// Confirm the save point
-		if let Some(prep) = prep {
-			self.save_points.save(prep);
-		}
+		self.inner.delete(&key.into())?;
 		// Return result
 		Ok(())
 	}
@@ -362,28 +300,12 @@ impl super::api::Transaction for Transaction {
 		// Get the arguments
 		let key = key.into();
 		let chk = chk.map(Into::into);
-		// Hydrate the savepoint if any
-		let prep = if self.save_points.is_some() {
-			self.save_point_prepare(&key, None, SaveOperation::Del).await?
-		} else {
-			None
-		};
-		// Does the key exists?
-		let current_val = if let Some(SavePrepare::NewKey(_, sv)) = &prep {
-			sv.get_val().cloned()
-		} else {
-			self.inner.get(&key)?
-		};
 		// Delete the key if valid
-		match (current_val, chk) {
+		match (self.inner.get(&key)?, chk) {
 			(Some(v), Some(w)) if v == w => self.inner.delete(&key)?,
 			(None, None) => self.inner.delete(&key)?,
 			_ => return Err(Error::TxConditionNotMet),
 		};
-		// Confirm the save point
-		if let Some(prep) = prep {
-			self.save_points.save(prep);
-		}
 		// Return result
 		Ok(())
 	}
@@ -444,8 +366,19 @@ impl super::api::Transaction for Transaction {
 	}
 }
 
-impl SavePointImpl for Transaction {
-	fn get_save_points(&mut self) -> &mut SavePoints {
-		&mut self.save_points
+impl Transaction {
+	pub(crate) fn new_save_point(&mut self) {
+		// Set the save point, the errors are ignored.
+		let _ = self.inner.set_savepoint();
+	}
+
+	pub(crate) async fn rollback_to_save_point(&mut self) -> Result<(), Error> {
+		// Rollback
+		self.inner.rollback_to_savepoint()?;
+		Ok(())
+	}
+
+	pub(crate) fn release_last_save_point(&mut self) -> Result<(), Error> {
+		Ok(())
 	}
 }
diff --git a/core/src/kvs/tr.rs b/core/src/kvs/tr.rs
index 04c0c972..0ce07f77 100644
--- a/core/src/kvs/tr.rs
+++ b/core/src/kvs/tr.rs
@@ -15,7 +15,6 @@ use crate::kvs::clock::SizedClock;
 	feature = "kv-tikv",
 	feature = "kv-fdb",
 	feature = "kv-indxdb",
-	feature = "kv-surrealkv",
 	feature = "kv-surrealcs",
 ))]
 use crate::kvs::savepoint::SavePointImpl;