diff --git a/.github/packages/npm-package/package.json.tmpl b/.github/packages/npm-package/package.json.tmpl
index d72e6e6..d53b95e 100644
--- a/.github/packages/npm-package/package.json.tmpl
+++ b/.github/packages/npm-package/package.json.tmpl
@@ -1,7 +1,7 @@
 {
   "name": "@magicblock-labs/${node_pkg}",
   "description": "MagicBlock Ephemeral VRF Oracle (${node_pkg})",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/magicblock-labs/ephemeral-vrf.git"
diff --git a/Cargo.lock b/Cargo.lock
index 04104f9..9a1640b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1692,7 +1692,7 @@ dependencies = [
 
 [[package]]
 name = "ephemeral-vrf"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "curve25519-dalek 4.1.3",
  "hkdf",
@@ -1702,7 +1702,7 @@ dependencies = [
 
 [[package]]
 name = "ephemeral-vrf-api"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "bincode",
  "borsh 0.10.4",
@@ -1717,7 +1717,7 @@ dependencies = [
 
 [[package]]
 name = "ephemeral-vrf-oracle"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "ephemeral-vrf",
  "solana-sdk",
@@ -1725,7 +1725,7 @@ dependencies = [
 
 [[package]]
 name = "ephemeral-vrf-program"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "base64 0.22.1",
  "curve25519-dalek 4.1.3",
@@ -1742,7 +1742,7 @@ dependencies = [
 
 [[package]]
 name = "ephemeral-vrf-sdk"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
@@ -1752,7 +1752,7 @@ dependencies = [
 
 [[package]]
 name = "ephemeral-vrf-sdk-vrf-macro"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7966,7 +7966,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "vrf-cli"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -7980,7 +7980,7 @@ dependencies = [
 
 [[package]]
 name = "vrf-oracle"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 907591b..f05dd2d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["api", "program", "sdk", "src", "vrf", "vrf-cli", "vrf-oracle"]
 
 [workspace.package]
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 license = "Business Source License 1.1"
 authors = ["MagicBlock Labs <dev@magicblock.xyz>"]
@@ -26,9 +26,9 @@ crossbeam-channel = "0.5.15"
 curve25519-dalek = { version = "4.1.3", default-features = false }
 env_logger = "0.11.7"
 ephemeral-rollups-sdk = "0.2.4"
-ephemeral-vrf = { path = "./vrf", version = "0.2.1" }
-ephemeral-vrf-api = { path = "./api", version = "0.2.1" }
-ephemeral-vrf-sdk-vrf-macro = { path = "sdk/vrf-macro", version = "0.2.1" }
+ephemeral-vrf = { path = "./vrf", version = "0.2.2" }
+ephemeral-vrf-api = { path = "./api", version = "0.2.2" }
+ephemeral-vrf-sdk-vrf-macro = { path = "sdk/vrf-macro", version = "0.2.2" }
 futures = "0.3.31"
 futures-core = "0.3.31"
 futures-util = "0.3.31"
diff --git a/api/src/sdk.rs b/api/src/sdk.rs
index d3cf5f8..0702942 100644
--- a/api/src/sdk.rs
+++ b/api/src/sdk.rs
@@ -74,7 +74,10 @@ pub fn initialize_oracle_queue(
     index: u8,
     bytes_to_allocate: Option<u32>,
 ) -> Vec<Instruction> {
-    println!("Queue: {:?}", oracle_queue_pda(&identity, index).0.to_string());
+    println!(
+        "Queue: {:?}",
+        oracle_queue_pda(&identity, index).0.to_string()
+    );
     let target_size = bytes_to_allocate.unwrap_or(9500);
     let inits = target_size.div_ceil(10240);
     let mut ixs = Vec::with_capacity(inits as usize);
diff --git a/sdk/src/pda.rs b/sdk/src/pda.rs
index cc48dd9..5f30aeb 100644
--- a/sdk/src/pda.rs
+++ b/sdk/src/pda.rs
@@ -1,4 +1,6 @@
-use solana_program::pubkey::Pubkey;
+use solana_program::pubkey::Pubkey as SolanaPubkey;
+
+use crate::{consts, Pubkey};
 
 /// NOTE: Copy/Pasted from delegation-program/src/pda.rs (modify there if needed)
 #[macro_export]
@@ -72,33 +74,33 @@ macro_rules! ephemeral_balance_seeds_from_payer {
 }
 
 pub fn delegation_record_pda_from_delegated_account(delegated_account: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         delegation_record_seeds_from_delegated_account!(delegated_account),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
 
 pub fn delegation_metadata_pda_from_delegated_account(delegated_account: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         delegation_metadata_seeds_from_delegated_account!(delegated_account),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
 
 pub fn commit_state_pda_from_delegated_account(delegated_account: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         commit_state_seeds_from_delegated_account!(delegated_account),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
 
 pub fn commit_record_pda_from_delegated_account(delegated_account: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         commit_record_seeds_from_delegated_account!(delegated_account),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
@@ -107,7 +109,7 @@ pub fn delegate_buffer_pda_from_delegated_account_and_owner_program(
     delegated_account: &Pubkey,
     owner_program: &Pubkey,
 ) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         delegate_buffer_seeds_from_delegated_account!(delegated_account),
         owner_program,
     )
@@ -115,37 +117,37 @@ pub fn delegate_buffer_pda_from_delegated_account_and_owner_program(
 }
 
 pub fn undelegate_buffer_pda_from_delegated_account(delegated_account: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         undelegate_buffer_seeds_from_delegated_account!(delegated_account),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
 
 pub fn fees_vault_pda() -> Pubkey {
-    Pubkey::find_program_address(fees_vault_seeds!(), &crate::id()).0
+    SolanaPubkey::find_program_address(fees_vault_seeds!(), &consts::VRF_PROGRAM_ID).0
 }
 
 pub fn validator_fees_vault_pda_from_validator(validator: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         validator_fees_vault_seeds_from_validator!(validator),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
 
 pub fn program_config_from_program_id(program_id: &Pubkey) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         program_config_seeds_from_program_id!(program_id),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }
 
 pub fn ephemeral_balance_pda_from_payer(payer: &Pubkey, index: u8) -> Pubkey {
-    Pubkey::find_program_address(
+    SolanaPubkey::find_program_address(
         ephemeral_balance_seeds_from_payer!(payer, index),
-        &crate::id(),
+        &consts::VRF_PROGRAM_ID,
     )
     .0
 }