diff --git a/Cargo.lock b/Cargo.lock
index 911058a2..e0ef9163 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2382,7 +2382,7 @@ dependencies = [
 
 [[package]]
 name = "nomic"
-version = "5.1.1"
+version = "5.1.2"
 dependencies = [
  "base64 0.13.1",
  "bech32 0.9.1",
@@ -2557,7 +2557,7 @@ dependencies = [
 [[package]]
 name = "orga"
 version = "0.3.1"
-source = "git+https://github.com/nomic-io/orga.git?rev=c5e44ab1b1c008212c175c6c6c47aecaa5948307#c5e44ab1b1c008212c175c6c6c47aecaa5948307"
+source = "git+https://github.com/nomic-io/orga.git?rev=028725159d614e28e5cc8f642a7d7e19e7a97afe#028725159d614e28e5cc8f642a7d7e19e7a97afe"
 dependencies = [
  "abci2",
  "async-trait",
@@ -2618,7 +2618,7 @@ dependencies = [
 [[package]]
 name = "orga-macros"
 version = "0.3.1"
-source = "git+https://github.com/nomic-io/orga.git?rev=c5e44ab1b1c008212c175c6c6c47aecaa5948307#c5e44ab1b1c008212c175c6c6c47aecaa5948307"
+source = "git+https://github.com/nomic-io/orga.git?rev=028725159d614e28e5cc8f642a7d7e19e7a97afe#028725159d614e28e5cc8f642a7d7e19e7a97afe"
 dependencies = [
  "darling",
  "heck 0.3.3",
diff --git a/Cargo.toml b/Cargo.toml
index 9f7ee1c4..4d57dfff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nomic"
-version = "5.1.1"
+version = "5.1.2"
 authors = [ "The Nomic Team <hello@nomic.io>" ]
 edition = "2021"
 default-run = "nomic"
diff --git a/build.rs b/build.rs
index 3ab07b40..c17e325a 100644
--- a/build.rs
+++ b/build.rs
@@ -67,11 +67,16 @@ fn main() {
 
         let shell = std::env::var("SHELL").unwrap_or("/bin/bash".to_string());
         println!("Using shell: {}", shell);
+
+        let cargo_features =
+            std::env::var("NOMIC_LEGACY_FEATURES").unwrap_or("full,feat-ibc,testnet".to_string());
+
         let res = std::process::Command::new(shell)
             .env_clear()
             .env("OUT_DIR", std::env::var("OUT_DIR").unwrap())
             .env("PATH", std::env::var("PATH").unwrap())
             .env("NOMIC_LEGACY_REV", rev)
+            .env("CARGO_FEATURES", cargo_features)
             .args(["build.sh"])
             .spawn()
             .unwrap()
diff --git a/build.sh b/build.sh
index 6a5751a9..d1a50596 100644
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,7 @@ BUILD_DIR=$OUT_DIR/nomic
 NOMIC_LEGACY_PATH=$OUT_DIR/nomic-$NOMIC_LEGACY_REV
 
 if [ ! -f "$NOMIC_LEGACY_PATH" ]; then
-    echo "Building legacy nomic at $BUILD_DIR..."
+    echo "Building legacy nomic at $NOMIC_LEGACY_PATH..."
     if [ ! -d "$BUILD_DIR" ]; then
         git clone https://github.com/nomic-io/nomic.git $BUILD_DIR
     fi
@@ -17,8 +17,9 @@ if [ ! -f "$NOMIC_LEGACY_PATH" ]; then
     git checkout $NOMIC_LEGACY_REV
 
     rustc --version
-    cargo build --release
-    mv $BUILD_DIR/target/release/nomic $NOMIC_LEGACY_PATH
+    echo "Building with features: $CARGO_FEATURES"
+    cargo build --release --no-default-features --features $CARGO_FEATURES
+    cp $BUILD_DIR/target/release/nomic $NOMIC_LEGACY_PATH
 else
     echo "Skipping legacy nomic binary build (already exists at $NOMIC_LEGACY_PATH)" 
 fi
diff --git a/rest/Cargo.lock b/rest/Cargo.lock
index 7d38c6d2..c9f31a05 100644
--- a/rest/Cargo.lock
+++ b/rest/Cargo.lock
@@ -2448,7 +2448,7 @@ dependencies = [
 
 [[package]]
 name = "nomic"
-version = "5.1.1"
+version = "5.1.2"
 dependencies = [
  "base64 0.13.1",
  "bech32 0.9.1",
@@ -2652,6 +2652,7 @@ dependencies = [
 [[package]]
 name = "orga"
 version = "0.3.1"
+source = "git+https://github.com/nomic-io/orga.git?rev=028725159d614e28e5cc8f642a7d7e19e7a97afe#028725159d614e28e5cc8f642a7d7e19e7a97afe"
 dependencies = [
  "abci2",
  "async-trait",
@@ -2712,6 +2713,7 @@ dependencies = [
 [[package]]
 name = "orga-macros"
 version = "0.3.1"
+source = "git+https://github.com/nomic-io/orga.git?rev=028725159d614e28e5cc8f642a7d7e19e7a97afe#028725159d614e28e5cc8f642a7d7e19e7a97afe"
 dependencies = [
  "darling",
  "heck 0.3.3",