diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 8cb47b171f..6c96588413 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -13,4 +13,4 @@ jobs:
     uses: stellar/actions/.github/workflows/rust-bump-version.yml@main
     with:
       version: ${{ inputs.version }}
-      base: soroban-wasmi-v0.16
+      base: soroban-wasmi-v0.30
diff --git a/Makefile b/Makefile
index 05ad87eb7d..874119f9a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,10 @@
 
 # Build all projects as if they are being published to crates.io, and do so for
 # all feature and target combinations.
-publish-dry-run-core:
-	cargo +stable publish --locked --dry-run --package soroban-wasmi_core
-
 publish-dry-run-top:
 	cargo +stable publish --locked --dry-run --package soroban-wasmi
 
 # Publish publishes the crate to crates.io. The dry-run is a dependency because
 # the dry-run target will verify all feature set combinations.
-publish-core: publish-dry-run-core
-	cargo +stable publish --locked --package soroban-wasmi_core
-
 publish-top: publish-dry-run-top
 	cargo +stable publish --locked --package soroban-wasmi
diff --git a/crates/arena/Cargo.toml b/crates/arena/Cargo.toml
index 38e2447221..5a75b25211 100644
--- a/crates/arena/Cargo.toml
+++ b/crates/arena/Cargo.toml
@@ -11,6 +11,7 @@ readme.workspace = true
 license.workspace = true
 keywords.workspace = true
 categories.workspace = true
+publish = false
 
 [features]
 default = ["std"]
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index f0db6c336d..abd8917e0e 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmi_cli"
-version = "0.30.0-soroban"
+version = "0.30.0"
 documentation = "https://docs.rs/wasmi/"
 description = "WebAssembly interpreter"
 authors.workspace = true
@@ -15,8 +15,8 @@ publish = false
 [dependencies]
 anyhow = "1"
 clap = { version = "4", features = ["derive"] }
-wasmi = { package = "soroban-wasmi", path = "../wasmi" }
-wasmi_wasi = { path = "../wasi" }
+wasmi = { version = "0.30.0", git = "https://github.com/paritytech/wasmi.git" }
+wasmi_wasi = { version = "0.30.0", git = "https://github.com/paritytech/wasmi.git" }
 wat = "1"
 
 [dev-dependencies]
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 733d74dfdb..9a0b0545ec 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
-name = "soroban-wasmi_core"
-version = "0.30.0-soroban"
-description = "Soroban fork of Parity WebAssembly interpreter"
+name = "wasmi_core"
+version = "0.12.0"
+documentation = "https://docs.rs/wasmi_core"
+description = "Core primitives for the wasmi WebAssembly interpreter"
 authors.workspace = true
 repository.workspace = true
 edition.workspace = true
@@ -9,6 +10,7 @@ readme.workspace = true
 license.workspace = true
 keywords.workspace = true
 categories.workspace = true
+publish = false
 
 [dependencies]
 libm = "0.2.1"
diff --git a/crates/core/src/host_error.rs b/crates/core/src/host_error.rs
index ace094273d..7f44e329f3 100644
--- a/crates/core/src/host_error.rs
+++ b/crates/core/src/host_error.rs
@@ -13,7 +13,6 @@ use downcast_rs::{impl_downcast, DowncastSync};
 /// # Examples
 ///
 /// ```rust
-/// use soroban_wasmi_core as wasmi_core;
 /// use std::fmt;
 /// use wasmi_core::{Trap, HostError};
 ///
diff --git a/crates/wasi/Cargo.toml b/crates/wasi/Cargo.toml
index cebecf687d..ae29096789 100644
--- a/crates/wasi/Cargo.toml
+++ b/crates/wasi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmi_wasi"
-version = "0.30.0-soroban"
+version = "0.30.0"
 documentation = "https://docs.rs/wasmi_wasi"
 description = "WASI library support for the wasmi interpreter"
 authors.workspace = true
@@ -16,7 +16,7 @@ publish = false
 wasi-common = "2.0"
 wasi-cap-std-sync = "2.0"
 wiggle = { version = "2.0", default-features = false, features = ["wiggle_metadata"] }
-wasmi = { package = "soroban-wasmi", path = "../wasmi" }
+wasmi = { version = "0.30.0", git = "https://github.com/paritytech/wasmi.git" }
 
 [dev-dependencies]
 wat = "1.0.50"
diff --git a/crates/wasmi/Cargo.toml b/crates/wasmi/Cargo.toml
index 2ff618cef8..8c7155dcd4 100644
--- a/crates/wasmi/Cargo.toml
+++ b/crates/wasmi/Cargo.toml
@@ -13,7 +13,7 @@ categories.workspace = true
 
 [dependencies]
 wasmparser = { version = "0.100.1", package = "wasmparser-nostd", default-features = false }
-wasmi_core = { package = "soroban-wasmi_core", version = "0.30.0-soroban", path = "../core", default-features = false }
+wasmi_core = { version = "0.12", path = "../core", default-features = false }
 wasmi_arena = { version = "0.4", path = "../arena", default-features = false }
 spin = { version = "0.9", default-features = false, features = [
     "mutex",