diff --git a/Cargo.lock b/Cargo.lock
index ad84d7e7f9e585..0be6654e884ef1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7162,10 +7162,10 @@ dependencies = [
 
 [[package]]
 name = "solana-package-metadata"
-version = "2.0.0"
+version = "2.1.0"
 dependencies = [
  "solana-package-metadata-macro",
- "solana-program",
+ "solana-pubkey",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index fb1bb220267712..5ec30da8b2c460 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -435,7 +435,7 @@ solana-msg = { path = "sdk/msg", version = "=2.1.0" }
 solana-net-utils = { path = "net-utils", version = "=2.1.0" }
 solana-nohash-hasher = "0.2.1"
 solana-notifier = { path = "notifier", version = "=2.1.0" }
-solana-package-metadata = { path = "sdk/package-metadata", version = "=2.0.0" }
+solana-package-metadata = { path = "sdk/package-metadata", version = "=2.1.0" }
 solana-package-metadata-macro = { path = "sdk/package-metadata-macro", version = "=2.1.0" }
 solana-perf = { path = "perf", version = "=2.1.0" }
 solana-poh = { path = "poh", version = "=2.1.0" }
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 2009cb78a6bd11..c77621fa74892a 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -3651,7 +3651,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 dependencies = [
- "toml 0.5.11",
+ "toml",
 ]
 
 [[package]]
@@ -3660,7 +3660,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
 ]
 
 [[package]]
@@ -4463,15 +4463,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -5612,23 +5603,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e"
 
-[[package]]
-name = "solana-package-metadata"
-version = "2.0.0"
-dependencies = [
- "solana-package-metadata-macro",
-]
-
-[[package]]
-name = "solana-package-metadata-macro"
-version = "2.0.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
- "toml 0.8.12",
-]
-
 [[package]]
 name = "solana-perf"
 version = "2.1.0"
@@ -6598,7 +6572,6 @@ dependencies = [
 name = "solana-sbf-rust-simulation"
 version = "2.1.0"
 dependencies = [
- "solana-package-metadata",
  "solana-program",
 ]
 
@@ -8064,26 +8037,11 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.12",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "toml_edit"
@@ -8093,20 +8051,7 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap 2.6.0",
  "toml_datetime",
- "winnow 0.5.25",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
-dependencies = [
- "indexmap 2.2.6",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.13",
+ "winnow",
 ]
 
 [[package]]
@@ -8786,15 +8731,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winreg"
 version = "0.50.0"
diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml
index 86c0ba399e053d..7a60f3a55d6e3b 100644
--- a/programs/sbf/Cargo.toml
+++ b/programs/sbf/Cargo.toml
@@ -44,7 +44,6 @@ solana-ledger = { path = "../../ledger", version = "=2.1.0" }
 solana-log-collector = { path = "../../log-collector", version = "=2.1.0" }
 solana-logger = { path = "../../logger", version = "=2.1.0" }
 solana-measure = { path = "../../measure", version = "=2.1.0" }
-solana-package-metadata = { path = "../../sdk/package-metadata", version = "=2.0.0" }
 solana-poseidon = { path = "../../poseidon/", version = "=2.1.0" }
 solana-program = { path = "../../sdk/program", version = "=2.1.0" }
 solana-program-runtime = { path = "../../program-runtime", version = "=2.1.0" }
diff --git a/programs/sbf/rust/simulation/Cargo.toml b/programs/sbf/rust/simulation/Cargo.toml
index 40a0bb69d84c08..3fd65622c876a4 100644
--- a/programs/sbf/rust/simulation/Cargo.toml
+++ b/programs/sbf/rust/simulation/Cargo.toml
@@ -9,11 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-solana-package-metadata = { workspace = true }
 solana-program = { workspace = true }
 
 [lib]
 crate-type = ["cdylib"]
-
-[package.metadata.solana]
-program-id = "Sim1jD5C35odT8mzctm8BWnjic8xW5xgeb5MbcbErTo"
diff --git a/programs/sbf/rust/simulation/src/lib.rs b/programs/sbf/rust/simulation/src/lib.rs
index 7721bf1a176be6..df761bd81698ca 100644
--- a/programs/sbf/rust/simulation/src/lib.rs
+++ b/programs/sbf/rust/simulation/src/lib.rs
@@ -12,7 +12,7 @@ use {
     std::convert::TryInto,
 };
 
-solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
+solana_program::declare_id!("Sim1jD5C35odT8mzctm8BWnjic8xW5xgeb5MbcbErTo");
 
 solana_program::entrypoint_no_alloc!(process_instruction);
 
diff --git a/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
index 4de95889d4bf4d..b4ff4139640939 100644
--- a/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
+++ b/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
@@ -11,8 +11,10 @@ publish = false
 
 [package.metadata.solana]
 tools-version = "v1.43"
+program-id = "MyProgram1111111111111111111111111111111111"
 
 [dependencies]
+solana-package-metadata = { path = "../../../../package-metadata", version = "=2.1.0" }
 solana-program = { path = "../../../../program", version = "=2.1.0" }
 
 [lib]
diff --git a/sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs b/sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs
index a6f2c05b770881..ee364d392441a8 100644
--- a/sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs
+++ b/sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs
@@ -2,6 +2,7 @@
 
 use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
 
+solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
 solana_program::entrypoint!(process_instruction);
 fn process_instruction(
     _program_id: &Pubkey,
diff --git a/sdk/package-metadata/Cargo.toml b/sdk/package-metadata/Cargo.toml
index db07908f7487a5..8f73e50055f7d4 100644
--- a/sdk/package-metadata/Cargo.toml
+++ b/sdk/package-metadata/Cargo.toml
@@ -11,9 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 solana-package-metadata-macro = { workspace = true }
-
-[dev-dependencies]
-solana-program = { workspace = true }
+solana-pubkey = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/package-metadata/src/lib.rs b/sdk/package-metadata/src/lib.rs
index 4f8d8426dbf2cb..28fdf08cca35ff 100644
--- a/sdk/package-metadata/src/lib.rs
+++ b/sdk/package-metadata/src/lib.rs
@@ -16,7 +16,7 @@
 ///
 /// You can fetch the copyright with the following:
 /// ```ignore
-/// use solana_sdk_macro::package_metadata;
+/// use solana_package_metadata::package_metadata;
 ///
 /// pub fn main() {
 ///     let copyright = package_metadata!("copyright");
@@ -48,6 +48,8 @@
 /// It does *not* currently support accessing TOML array elements directly.
 /// TOML tables are not supported.
 pub use solana_package_metadata_macro::package_metadata;
+/// Re-export solana_pubkey::declare_id for easy usage within the macro
+pub use solana_pubkey::declare_id;
 
 /// Convenience macro for declaring a program id from Cargo.toml package metadata.
 ///
@@ -75,7 +77,7 @@ pub use solana_package_metadata_macro::package_metadata;
 /// This program id behaves exactly as if the developer had written:
 ///
 /// ```
-/// solana_program::declare_id!("MyProgram1111111111111111111111111111111111");
+/// solana_pubkey::declare_id!("MyProgram1111111111111111111111111111111111");
 /// ```
 ///
 /// Meaning that it's possible to refer to the program id using `crate::id()`,
@@ -83,8 +85,6 @@ pub use solana_package_metadata_macro::package_metadata;
 #[macro_export]
 macro_rules! declare_id_with_package_metadata {
     ($key:literal) => {
-        solana_program::declare_id!(solana_program::pubkey::Pubkey::from_str_const(
-            $crate::package_metadata!($key)
-        ));
+        $crate::declare_id!($crate::package_metadata!($key));
     };
 }