diff --git a/Cargo.lock b/Cargo.lock
index 2a0118a..04dff48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -83,6 +83,26 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "const_format"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -450,9 +470,10 @@ dependencies = [
 
 [[package]]
 name = "icarus_envy"
-version = "0.2.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.2.0#3ee8c1e573ba9637769aa0538d2c11335e39ed9f"
+version = "0.2.2"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.2.2-devel-84ea6e4c22-006#84ea6e4c223f19ff96f6b7cae944e831ef4aa831"
 dependencies = [
+ "const_format",
  "dotenvy",
 ]
 
@@ -1148,7 +1169,6 @@ dependencies = [
 name = "songparser"
 version = "0.1.0"
 dependencies = [
- "dotenvy",
  "futures",
  "icarus_envy",
  "icarus_models",
@@ -1415,6 +1435,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index ed00706..1c5aace 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,5 @@ reqwest = { version = "0.12.19", features = ["json", "stream"] }
 serde = { version = "1.0.218", features = ["derive"] }
 serde_json = { version = "1.0.139" }
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
-dotenvy = { version = "0.15.7" }
 icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
-icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.2.0" }
+icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.2.2-devel-84ea6e4c22-006" }
diff --git a/src/main.rs b/src/main.rs
index efbb604..6a41d11 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,7 @@ pub const SECONDS_TO_SLEEP: u64 = 5;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let app_base_url = get_icarus_url().await;
+    let app_base_url = icarus_envy::environment::get_icarus_base_api_url().await;
 
     loop {
         println!("Base URL: {}", app_base_url);
@@ -160,8 +160,3 @@ mod api {
         }
     }
 }
-
-async fn get_icarus_url() -> String {
-    dotenvy::dotenv().ok();
-    std::env::var("ICARUS_BASE_API_URL").expect("Could not find url")
-}