diff --git a/apps/aqua/src/repos/feed_play.rs b/apps/aqua/src/repos/feed_play.rs
index 7c8f32d..0cdbefc 100644
--- a/apps/aqua/src/repos/feed_play.rs
+++ b/apps/aqua/src/repos/feed_play.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use jacquard_common::from_json_value;
 use types::fm_teal::feed::{Artist, PlayView};
 
-use super::{mbid_uri, pg::PgDataSource, utc_to_atrium_datetime};
+use super::{mbid_uri, pg::PgDataSource, uri_value, utc_to_atrium_datetime};
 
 #[async_trait]
 pub trait FeedPlayRepo: Send + Sync {
@@ -58,8 +58,8 @@ impl FeedPlayRepo for PgDataSource {
             release_name: row.release_name.clone().map(|s| s.into()),
             release_mb_id: row.release_mbid.map(mbid_uri),
             isrc: row.isrc.map(|s| s.into()),
-            origin_url: row.origin_url.map(|s| s.into()),
-            music_service_base_domain: row.music_service_base_domain.map(|s| s.into()),
+            origin_uri: row.origin_url.map(uri_value),
+            music_service_uri: row.music_service_base_domain.map(uri_value),
             submission_client_agent: row.submission_client_agent.map(|s| s.into()),
             played_time: row
                 .played_time
@@ -117,8 +117,8 @@ impl FeedPlayRepo for PgDataSource {
                 release_name: row.release_name.clone().map(|s| s.into()),
                 release_mb_id: row.release_mbid.map(mbid_uri),
                 isrc: row.isrc.map(|s| s.into()),
-                origin_url: row.origin_url.map(|s| s.into()),
-                music_service_base_domain: row.music_service_base_domain.map(|s| s.into()),
+                origin_uri: row.origin_url.map(uri_value),
+                music_service_uri: row.music_service_base_domain.map(uri_value),
                 submission_client_agent: row.submission_client_agent.map(|s| s.into()),
                 played_time: row
                     .played_time
diff --git a/apps/aqua/src/repos/mod.rs b/apps/aqua/src/repos/mod.rs
index 25b75c4..1b5db3b 100644
--- a/apps/aqua/src/repos/mod.rs
+++ b/apps/aqua/src/repos/mod.rs
@@ -35,3 +35,7 @@ pub fn time_to_chrono_utc(dt: time::OffsetDateTime) -> chrono::DateTime<chrono::
 pub fn mbid_uri(mbid: Uuid) -> UriValue {
     UriValue::Any(SmolStr::new(format!("mbid:{mbid}")))
 }
+
+pub fn uri_value(value: String) -> UriValue {
+    UriValue::Any(SmolStr::new(value))
+}
diff --git a/apps/aqua/src/repos/stats.rs b/apps/aqua/src/repos/stats.rs
index 0293e41..babc6df 100644
--- a/apps/aqua/src/repos/stats.rs
+++ b/apps/aqua/src/repos/stats.rs
@@ -230,8 +230,8 @@ impl StatsRepo for PgDataSource {
                 release_name: row.release_name.map(|s| s.into()),
                 release_mb_id: row.release_mbid.map(mbid_uri),
                 isrc: row.isrc.map(|s| s.into()),
-                origin_url: row.origin_url.map(|s| s.into()),
-                music_service_base_domain: row.music_service_base_domain.map(|s| s.into()),
+                origin_uri: row.origin_url.map(crate::repos::uri_value),
+                music_service_uri: row.music_service_base_domain.map(crate::repos::uri_value),
                 submission_client_agent: row.submission_client_agent.map(|s| s.into()),
                 played_time: row
                     .played_time
diff --git a/services/cadet/src/ingestors/teal/feed_play.rs b/services/cadet/src/ingestors/teal/feed_play.rs
index 6276439..92173e7 100644
--- a/services/cadet/src/ingestors/teal/feed_play.rs
+++ b/services/cadet/src/ingestors/teal/feed_play.rs
@@ -1468,9 +1468,9 @@ impl PlayIngestor {
             .as_ref()
             .map(ToString::to_string);
         let music_service_base_domain = play_record
-            .music_service_base_domain
+            .music_service_uri
             .as_ref()
-            .map(ToString::to_string);
+            .map(|uri| uri.as_str().to_string());
 
         sqlx::query!(
             r#"
diff --git a/tools/lexicon-cli/src/commands/generate.ts b/tools/lexicon-cli/src/commands/generate.ts
index 365e82c..70f7157 100644
--- a/tools/lexicon-cli/src/commands/generate.ts
+++ b/tools/lexicon-cli/src/commands/generate.ts
@@ -96,7 +96,7 @@ async function generateRust(workspaceRoot: string, force?: boolean) {
           await execa("cargo", ["binstall", "--version"], { stdio: "pipe" });
           await execa(
             "cargo",
-            ["binstall", "-y", "jacquard-lexgen", "--version", "0.12.0-beta.2"],
+            ["binstall", "-y", "jacquard-lexgen", "--version", "0.12.1"],
             {
               stdio: "inherit",
             },
@@ -107,7 +107,7 @@ async function generateRust(workspaceRoot: string, force?: boolean) {
             "install",
             "jacquard-lexgen",
             "--version",
-            "0.12.0-beta.2",
+            "0.12.1",
           ], {
             stdio: "inherit",
           });
@@ -115,7 +115,7 @@ async function generateRust(workspaceRoot: string, force?: boolean) {
         console.log(pc.green("    ✓ jacquard-codegen installed successfully"));
       } catch (installError) {
         throw new Error(
-          "Failed to install jacquard-codegen. Please install manually: cargo install jacquard-lexgen --version 0.12.0-beta.2",
+          "Failed to install jacquard-codegen. Please install manually: cargo install jacquard-lexgen --version 0.12.1",
         );
       }
     }