diff --git a/dev_docs/uuid_naming_convention_report.md b/dev_docs/uuid_naming_convention_report.md
new file mode 100644
index 00000000..2f6c18a1
--- /dev/null
+++ b/dev_docs/uuid_naming_convention_report.md
@@ -0,0 +1,317 @@
+# UUID Naming Convention Report
+
+**Date:** 2026-02-14
+**Status:** Analysis Complete — Decision Required
+
+---
+
+## Executive Summary
+
+PhoenixKit has **two distinct primary key patterns** across its schemas. The project convention states that `id` = integer column and `uuid` = UUID column. However, 25 schemas created with UUID-native primary keys use `id` as the UUID column name, violating this convention. This report documents the affected schemas, explains the connections module situation (raised by leadership), and provides options for resolution.
+
+---
+
+## 1. The Two Primary Key Patterns
+
+### Pattern 1: Migrated Tables (Convention-Compliant)
+
+Tables that existed before the UUID migration. They have both column types:
+
+| Column | Type | Role |
+|--------|------|------|
+| `id` | `BIGSERIAL` | Legacy integer PK (auto-increment) |
+| `uuid` | `UUID` | New UUID PK (UUIDv7) |
+
+**Schema declaration:**
+```elixir
+@primary_key {:uuid, UUIDv7, autogenerate: true}
+```
+
+**Modules using this pattern:** Billing, Emails, Entities, AI, Shop, Sync, Referrals, Legal
+
+These tables follow the naming convention correctly.
+
+### Pattern 2: UUID-Native Tables (Convention Violation)
+
+Tables created after the UUID migration decision. The `id` column IS a UUID:
+
+| Column | Type | Role |
+|--------|------|------|
+| `id` | `UUID` | UUID primary key (no integer column exists) |
+
+**Schema declaration:**
+```elixir
+@primary_key {:id, UUIDv7, autogenerate: true}
+```
+
+**These tables have NO integer `id` column.** The naming is misleading because `record.id` returns a UUID, not an integer.
+
+---
+
+## 2. All 25 Affected Schemas (Pattern 2)
+
+### Comments Module (3 schemas)
+| Schema | File | Migration |
+|--------|------|-----------|
+| `Comment` | `lib/modules/comments/comment.ex` | V55 |
+| `CommentLike` | `lib/modules/comments/comment_like.ex` | V55 |
+| `CommentDislike` | `lib/modules/comments/comment_dislike.ex` | V55 |
+
+### Posts Module (10 schemas)
+| Schema | File | Migration |
+|--------|------|-----------|
+| `Post` | `lib/modules/posts/post.ex` | V29 |
+| `PostComment` | `lib/modules/posts/post_comment.ex` | V29 |
+| `PostGroup` | `lib/modules/posts/post_group.ex` | V29 |
+| `PostTag` | `lib/modules/posts/post_tag.ex` | V29 |
+| `PostMedia` | `lib/modules/posts/post_media.ex` | V29 |
+| `PostMention` | `lib/modules/posts/post_mention.ex` | V29 |
+| `PostView` | `lib/modules/posts/post_view.ex` | V29 |
+| `PostLike` | `lib/modules/posts/post_like.ex` | V29 |
+| `PostDislike` | `lib/modules/posts/post_dislike.ex` | V29 |
+
+### Connections Module (6 schemas)
+| Schema | File | Migration |
+|--------|------|-----------|
+| `Connection` | `lib/modules/connections/connection.ex` | V36 |
+| `ConnectionHistory` | `lib/modules/connections/connection_history.ex` | V36 |
+| `Follow` | `lib/modules/connections/follow.ex` | V36 |
+| `FollowHistory` | `lib/modules/connections/follow_history.ex` | V36 |
+| `Block` | `lib/modules/connections/block.ex` | V36 |
+| `BlockHistory` | `lib/modules/connections/block_history.ex` | V36 |
+
+### Storage Module (5 schemas)
+| Schema | File | Migration |
+|--------|------|-----------|
+| `Bucket` | `lib/modules/storage/bucket.ex` | V20 |
+| `Dimension` | `lib/modules/storage/dimension.ex` | V20 |
+| `File` | `lib/modules/storage/file.ex` | V20 |
+| `FileInstance` | `lib/modules/storage/file_instance.ex` | V20 |
+| `FileLocation` | `lib/modules/storage/file_location.ex` | V20 |
+
+### Tickets Module (4 schemas)
+| Schema | File | Migration |
+|--------|------|-----------|
+| `Ticket` | `lib/modules/tickets/ticket.ex` | V35 |
+| `TicketAttachment` | `lib/modules/tickets/ticket_attachment.ex` | V35 |
+| `TicketComment` | `lib/modules/tickets/ticket_comment.ex` | V35 |
+| `TicketStatusHistory` | `lib/modules/tickets/ticket_status_history.ex` | V35 |
+
+---
+
+## 3. Connections Module Deep-Dive (Boss Question)
+
+### What the Boss Saw
+
+The connections module schemas contain `belongs_to` associations with `type: :integer`:
+
+```elixir
+# From connection.ex
+belongs_to :requester, User, type: :integer
+belongs_to :recipient, User, type: :integer
+
+# From follow.ex
+belongs_to :follower, User, type: :integer
+belongs_to :followed, User, type: :integer
+
+# From block.ex
+belongs_to :blocker, User, type: :integer
+belongs_to :blocked, User, type: :integer
+```
+
+### Why This Is Correct
+
+The `type: :integer` declaration is **accurate and required**. Here's why:
+
+**The V36 migration (connections tables) created FK columns as BIGINT:**
+
+```sql
+-- From lib/phoenix_kit/migrations/postgres/v36.ex
+create table(:phoenix_kit_connections, primary_key: false) do
+  add(:id, :uuid, primary_key: true, default: fragment("uuid_generate_v7()"))
+  add(:requester_id, references(:phoenix_kit_users, type: :bigint), null: false)
+  add(:recipient_id, references(:phoenix_kit_users, type: :bigint), null: false)
+  -- ...
+end
+```
+
+**What this means in the database:**
+
+| Column | DB Type | References | Purpose |
+|--------|---------|------------|---------|
+| `id` | `UUID` | (primary key) | Record identifier |
+| `requester_id` | `BIGINT` | `phoenix_kit_users(id)` | Integer FK to users table |
+| `recipient_id` | `BIGINT` | `phoenix_kit_users(id)` | Integer FK to users table |
+| `requester_uuid` | `UUID` | (no FK constraint) | Dual-write UUID field (V56) |
+| `recipient_uuid` | `UUID` | (no FK constraint) | Dual-write UUID field (V56) |
+
+The `phoenix_kit_users` table has an integer `id` column (BIGSERIAL) and a separate `uuid` column. The connections FK columns point to the **integer** `id`, so `type: :integer` in the Ecto schema is the correct type declaration.
+
+### The Dual-Write UUID Fields
+
+V56 added `*_uuid` columns to connections tables for the UUID migration:
+
+```elixir
+# These are plain fields, NOT belongs_to associations
+field :requester_uuid, UUIDv7
+field :recipient_uuid, UUIDv7
+```
+
+These UUID fields:
+- Have NO foreign key constraints in the database
+- Cannot be used for Ecto `preload` (no `belongs_to` association)
+- Are populated via dual-write triggers/callbacks
+- Will eventually replace the integer FKs in Phase 4 of the UUID migration
+
+### The Actual Naming Issue
+
+The confusing part is **not** the `type: :integer` on FKs. The issue is that `connection.id` returns a UUID value despite being named `id`. This is the Pattern 2 violation described in this report.
+
+---
+
+## 4. How Each Module's DB Columns Actually Look
+
+### Example: Connections `phoenix_kit_connections` Table
+
+```
+Column          | Type    | Notes
+----------------|---------|----------------------------------
+id              | UUID    | PK (UUIDv7) — naming violation
+requester_id    | BIGINT  | FK → phoenix_kit_users(id) — correct integer
+recipient_id    | BIGINT  | FK → phoenix_kit_users(id) — correct integer
+requester_uuid  | UUID    | Dual-write field (V56) — no FK
+recipient_uuid  | UUID    | Dual-write field (V56) — no FK
+status          | VARCHAR |
+inserted_at     | TIMESTAMP |
+updated_at      | TIMESTAMP |
+```
+
+### Example: Tickets `phoenix_kit_tickets` Table
+
+```
+Column          | Type    | Notes
+----------------|---------|----------------------------------
+id              | UUID    | PK (UUIDv7) — naming violation
+user_id         | BIGINT  | FK → phoenix_kit_users(id) — correct integer
+user_uuid       | UUID    | Dual-write field (V56) — no FK
+subject         | VARCHAR |
+description     | TEXT    |
+status          | VARCHAR |
+priority        | VARCHAR |
+inserted_at     | TIMESTAMP |
+updated_at      | TIMESTAMP |
+```
+
+### Common Pattern Across All 25 Schemas
+
+- **PK column:** `id` is UUID type (should be named `uuid` per convention)
+- **User FKs:** `user_id` / `requester_id` etc. are BIGINT (correctly named, correctly typed)
+- **Dual-write fields:** `*_uuid` columns are UUID (correctly named, added by V56)
+
+---
+
+## 5. What Fixing the Convention Would Require
+
+Renaming `id` → `uuid` on Pattern 2 tables is a **heavy database migration**:
+
+### Per Table:
+1. Drop all FK constraints from child tables pointing to `table(id)`
+2. Rename column: `ALTER TABLE table RENAME COLUMN id TO uuid`
+3. Add new integer column: `ALTER TABLE table ADD COLUMN id BIGSERIAL`
+4. Recreate all FK constraints pointing to `table(uuid)` instead of `table(id)`
+5. Update all Ecto schemas: `@primary_key {:uuid, UUIDv7, ...}`
+6. Update all `belongs_to` references in child schemas
+7. Update all queries, routes, and templates using `.id`
+
+### Scale of Impact:
+
+| Module | Tables | Child FK References |
+|--------|--------|---------------------|
+| Posts | 9 | PostComment, PostTag, PostMedia, PostMention, PostView, PostLike, PostDislike all reference Post |
+| Connections | 6 | History tables reference main tables |
+| Storage | 5 | FileInstance, FileLocation reference File; Dimension references Bucket |
+| Tickets | 4 | TicketComment, TicketAttachment, TicketStatusHistory reference Ticket |
+| Comments | 3 | CommentLike, CommentDislike reference Comment |
+| **Total** | **27 tables** | **50+ FK relationships** |
+
+### Additional Impact:
+- All `phx-value-id` in templates need updating to `phx-value-uuid`
+- All route params using `:id` need updating to `:uuid`
+- All context functions using `get_by_id` need updating
+- Parent app code referencing these schemas will break
+
+---
+
+## 6. Options
+
+### Option A: Full Convention Fix (Heavy)
+- Rename `id` → `uuid` in DB and schemas for all 25 schemas
+- Add integer `id` columns for consistency with Pattern 1
+- **Pros:** Single consistent convention across all schemas
+- **Cons:** V57+ migration touching 27 tables and 50+ FKs; breaking change for parent apps
+
+### Option B: Schema-Only Fix (Medium)
+- Keep DB column named `id` but alias it in Ecto schema:
+  ```elixir
+  @primary_key {:uuid, UUIDv7, autogenerate: true, source: :id}
+  ```
+- Elixir code uses `.uuid`, DB column stays `id`
+- **Pros:** No DB migration needed; convention-compliant in code
+- **Cons:** Schema/DB name mismatch can confuse debugging; `source: :id` adds cognitive overhead
+
+### Option C: Document the Two Patterns (Light)
+- Accept that Pattern 2 tables use `id` as UUID
+- Document the convention clearly in CLAUDE.md and dev guides
+- Add code comments in each Pattern 2 schema
+- **Pros:** Zero migration risk; no breaking changes
+- **Cons:** Two conventions in the codebase; ongoing confusion potential
+
+### Option D: Fix Going Forward Only (Pragmatic)
+- New tables follow Pattern 1 convention (integer `id` + UUID `uuid`)
+- Existing Pattern 2 tables remain as-is but are documented
+- **Pros:** Prevents further divergence; no migration risk
+- **Cons:** Still two patterns, but clearly delineated by creation date
+
+---
+
+## 7. Recommendation
+
+**Option B (Schema-Only Fix)** offers the best balance:
+
+- No database migration required
+- Code convention becomes consistent: `.uuid` always returns UUID
+- Ecto's `source:` option is well-supported and commonly used
+- Can be done incrementally, one module at a time
+- No breaking changes to database or FK constraints
+
+If Option B is chosen, each Pattern 2 schema changes from:
+```elixir
+@primary_key {:id, UUIDv7, autogenerate: true}
+```
+to:
+```elixir
+@primary_key {:uuid, UUIDv7, autogenerate: true, source: :id}
+```
+
+And all code referencing `record.id` changes to `record.uuid`.
+
+---
+
+## Appendix: Quick Reference
+
+### Convention Rule
+| Name | Type | Example Value |
+|------|------|---------------|
+| `id` | Integer (BIGSERIAL) | `42` |
+| `uuid` | UUID (UUIDv7) | `019503a1-2b3c-7def-8012-3456789abcde` |
+
+### Pattern 1 (Compliant) — 8 modules
+Billing, Emails, Entities, AI, Shop, Sync, Referrals, Legal
+
+### Pattern 2 (Violation) — 5 modules, 25 schemas
+Comments (3), Posts (10), Connections (6), Storage (5), Tickets (4)
+
+### Connections Module TL;DR for Leadership
+- `belongs_to :requester, User, type: :integer` — **correct**, the DB FK column is BIGINT
+- `connection.id` returning a UUID — **naming violation** of the convention (this report's main finding)
+- The `*_uuid` dual-write fields are working correctly for the UUID migration
diff --git a/lib/mix/tasks/phoenix_kit.update.ex b/lib/mix/tasks/phoenix_kit.update.ex
index d84105b0..0c137920 100644
--- a/lib/mix/tasks/phoenix_kit.update.ex
+++ b/lib/mix/tasks/phoenix_kit.update.ex
@@ -94,6 +94,7 @@ if Code.ensure_loaded?(Igniter.Mix.Task) do
       RateLimiterConfig
     }
 
+    alias PhoenixKit.Migrations.UUIDRepair
     alias PhoenixKit.Utils.Routes
 
     @shortdoc "Updates PhoenixKit to the latest version"
@@ -564,8 +565,6 @@ if Code.ensure_loaded?(Igniter.Mix.Task) do
 
     # Run UUID column repair for upgrades from pre-1.7.0 installations
     defp run_uuid_repair(prefix) do
-      alias PhoenixKit.Migrations.UUIDRepair
-
       case UUIDRepair.maybe_repair(prefix: prefix) do
         {:ok, :not_needed} ->
           # No repair needed, continue silently
diff --git a/lib/modules/billing/web/billing_profile_form.ex b/lib/modules/billing/web/billing_profile_form.ex
index b41713ff..b3462ad3 100644
--- a/lib/modules/billing/web/billing_profile_form.ex
+++ b/lib/modules/billing/web/billing_profile_form.ex
@@ -45,7 +45,7 @@ defmodule PhoenixKit.Modules.Billing.Web.BillingProfileForm do
     |> assign(:url_path, Routes.path("/admin/billing/profiles/new"))
     |> assign(:profile, nil)
     |> assign(:form, to_form(changeset))
-    |> assign(:selected_user_id, nil)
+    |> assign(:selected_user_uuid, nil)
     |> assign(:subdivision_label, "Region")
   end
 
@@ -64,7 +64,7 @@ defmodule PhoenixKit.Modules.Billing.Web.BillingProfileForm do
         |> assign(:url_path, Routes.path("/admin/billing/profiles/#{profile.uuid}/edit"))
         |> assign(:profile, profile)
         |> assign(:form, to_form(changeset))
-        |> assign(:selected_user_id, profile.user_uuid)
+        |> assign(:selected_user_uuid, profile.user_uuid)
         |> assign(:profile_type, profile.type)
         |> assign(:subdivision_label, CountryData.get_subdivision_label(profile.country))
     end
@@ -78,7 +78,7 @@ defmodule PhoenixKit.Modules.Billing.Web.BillingProfileForm do
   @impl true
   def handle_event("select_user", %{"user_id" => user_id}, socket) do
     user_id = if user_id == "", do: nil, else: user_id
-    {:noreply, assign(socket, :selected_user_id, user_id)}
+    {:noreply, assign(socket, :selected_user_uuid, user_id)}
   end
 
   @impl true
@@ -106,7 +106,7 @@ defmodule PhoenixKit.Modules.Billing.Web.BillingProfileForm do
   def handle_event("save", %{"billing_profile" => params}, socket) do
     params =
       params
-      |> Map.put("user_uuid", socket.assigns.selected_user_id)
+      |> Map.put("user_uuid", socket.assigns.selected_user_uuid)
       |> Map.put("type", socket.assigns.profile_type)
 
     save_profile(socket, params)
@@ -117,7 +117,7 @@ defmodule PhoenixKit.Modules.Billing.Web.BillingProfileForm do
       if socket.assigns.profile do
         Billing.update_billing_profile(socket.assigns.profile, params)
       else
-        case socket.assigns.selected_user_id do
+        case socket.assigns.selected_user_uuid do
           nil ->
             {:error, :no_user}
 
diff --git a/lib/modules/billing/web/billing_profile_form.html.heex b/lib/modules/billing/web/billing_profile_form.html.heex
index ac8565bc..3729ec63 100644
--- a/lib/modules/billing/web/billing_profile_form.html.heex
+++ b/lib/modules/billing/web/billing_profile_form.html.heex
@@ -48,7 +48,7 @@
               <%= for user <- @users do %>
                 <option
                   value={user.uuid}
-                  selected={to_string(@selected_user_id) == to_string(user.uuid)}
+                  selected={to_string(@selected_user_uuid) == to_string(user.uuid)}
                 >
                   {user.email}
                   <%= if user.first_name do %>
diff --git a/lib/modules/billing/web/order_form.ex b/lib/modules/billing/web/order_form.ex
index 6d994a1e..97c715f0 100644
--- a/lib/modules/billing/web/order_form.ex
+++ b/lib/modules/billing/web/order_form.ex
@@ -52,8 +52,8 @@ defmodule PhoenixKit.Modules.Billing.Web.OrderForm do
     |> assign(:order, nil)
     |> assign(:form, to_form(changeset))
     |> assign(:line_items, [%{id: 0, name: "", description: "", quantity: 1, unit_price: "0.00"}])
-    |> assign(:selected_user_id, nil)
-    |> assign(:selected_billing_profile_id, nil)
+    |> assign(:selected_user_uuid, nil)
+    |> assign(:selected_billing_profile_uuid, nil)
     |> assign(:country_tax_rate, nil)
     |> assign(:country_name, nil)
     |> assign(:country_vat_percent, nil)
@@ -87,9 +87,9 @@ defmodule PhoenixKit.Modules.Billing.Web.OrderForm do
         |> assign(:order, order)
         |> assign(:form, to_form(changeset))
         |> assign(:line_items, line_items)
-        |> assign(:selected_user_id, order.user_uuid)
+        |> assign(:selected_user_uuid, order.user_uuid)
         |> assign(:billing_profiles, billing_profiles)
-        |> assign(:selected_billing_profile_id, order.billing_profile_uuid)
+        |> assign(:selected_billing_profile_uuid, order.billing_profile_uuid)
         |> assign(:country_tax_rate, country_tax_rate)
         |> assign(:country_name, country_name)
         |> assign(:country_vat_percent, country_vat_percent)
@@ -141,9 +141,9 @@ defmodule PhoenixKit.Modules.Billing.Web.OrderForm do
 
     {:noreply,
      socket
-     |> assign(:selected_user_id, user_id)
+     |> assign(:selected_user_uuid, user_id)
      |> assign(:billing_profiles, billing_profiles)
-     |> assign(:selected_billing_profile_id, selected_profile_id)
+     |> assign(:selected_billing_profile_uuid, selected_profile_id)
      |> assign(:country_tax_rate, country_tax_rate)
      |> assign(:country_name, country_name)
      |> assign(:country_vat_percent, country_vat_percent)}
@@ -241,8 +241,8 @@ defmodule PhoenixKit.Modules.Billing.Web.OrderForm do
       |> Map.put("tax_rate", Decimal.to_string(tax_rate))
       |> Map.put("tax_amount", Decimal.to_string(tax_amount))
       |> Map.put("total", Decimal.to_string(total))
-      |> Map.put("user_uuid", socket.assigns.selected_user_id)
-      |> Map.put("billing_profile_uuid", socket.assigns.selected_billing_profile_id)
+      |> Map.put("user_uuid", socket.assigns.selected_user_uuid)
+      |> Map.put("billing_profile_uuid", socket.assigns.selected_billing_profile_uuid)
 
     save_order(socket, order_params)
   end
@@ -282,7 +282,7 @@ defmodule PhoenixKit.Modules.Billing.Web.OrderForm do
 
     {:noreply,
      socket
-     |> assign(:selected_billing_profile_id, profile_id)
+     |> assign(:selected_billing_profile_uuid, profile_id)
      |> assign(:country_tax_rate, country_tax_rate)
      |> assign(:country_name, country_name)
      |> assign(:country_vat_percent, country_vat_percent)}
diff --git a/lib/modules/billing/web/order_form.html.heex b/lib/modules/billing/web/order_form.html.heex
index 88695f58..b088d211 100644
--- a/lib/modules/billing/web/order_form.html.heex
+++ b/lib/modules/billing/web/order_form.html.heex
@@ -42,7 +42,7 @@
                 <%= for user <- @users do %>
                   <option
                     value={user.uuid}
-                    selected={to_string(@selected_user_id) == to_string(user.uuid)}
+                    selected={to_string(@selected_user_uuid) == to_string(user.uuid)}
                   >
                     {user.email}
                   </option>
@@ -50,7 +50,7 @@
               </select>
             </div>
 
-            <%= if @selected_user_id do %>
+            <%= if @selected_user_uuid do %>
               <%= if length(@billing_profiles) > 0 do %>
                 <div class="form-control">
                   <label class="label">
@@ -68,7 +68,7 @@
                       <option
                         value={profile.uuid}
                         selected={
-                          to_string(@selected_billing_profile_id) == to_string(profile.uuid)
+                          to_string(@selected_billing_profile_uuid) == to_string(profile.uuid)
                         }
                       >
                         <%= if profile.type == "company" do %>
@@ -93,7 +93,7 @@
                         <.link
                           navigate={
                             PhoenixKit.Utils.Routes.path(
-                              "/admin/billing/profiles/new?user_id=#{@selected_user_id}"
+                              "/admin/billing/profiles/new?user_id=#{@selected_user_uuid}"
                             )
                           }
                           class="link font-medium"
@@ -285,7 +285,7 @@
         <button
           type="submit"
           class="btn btn-primary"
-          disabled={@selected_user_id && Enum.empty?(@billing_profiles)}
+          disabled={@selected_user_uuid && Enum.empty?(@billing_profiles)}
         >
           <.icon name="hero-check" class="w-4 h-4" />
           {if @order, do: "Update Order", else: "Create Order"}
diff --git a/lib/modules/billing/web/subscription_detail.ex b/lib/modules/billing/web/subscription_detail.ex
index 2f9f2883..b84c2a7c 100644
--- a/lib/modules/billing/web/subscription_detail.ex
+++ b/lib/modules/billing/web/subscription_detail.ex
@@ -34,7 +34,7 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionDetail do
             |> assign(:subscription, subscription)
             |> assign(:plans, plans)
             |> assign(:show_change_plan_modal, false)
-            |> assign(:selected_new_plan_id, nil)
+            |> assign(:selected_new_plan_uuid, nil)
 
           {:ok, socket}
       end
@@ -112,7 +112,7 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionDetail do
     {:noreply,
      socket
      |> assign(:show_change_plan_modal, true)
-     |> assign(:selected_new_plan_id, nil)}
+     |> assign(:selected_new_plan_uuid, nil)}
   end
 
   @impl true
@@ -123,12 +123,12 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionDetail do
   @impl true
   def handle_event("select_new_plan", %{"plan_id" => plan_id}, socket) do
     plan_id = if plan_id == "", do: nil, else: plan_id
-    {:noreply, assign(socket, :selected_new_plan_id, plan_id)}
+    {:noreply, assign(socket, :selected_new_plan_uuid, plan_id)}
   end
 
   @impl true
   def handle_event("change_plan", _params, socket) do
-    %{subscription: subscription, selected_new_plan_id: new_plan_id} = socket.assigns
+    %{subscription: subscription, selected_new_plan_uuid: new_plan_id} = socket.assigns
 
     if new_plan_id && to_string(new_plan_id) != to_string(subscription.plan_uuid) do
       case Billing.change_subscription_plan(subscription, new_plan_id) do
diff --git a/lib/modules/billing/web/subscription_detail.html.heex b/lib/modules/billing/web/subscription_detail.html.heex
index c55256c6..13bc2ffa 100644
--- a/lib/modules/billing/web/subscription_detail.html.heex
+++ b/lib/modules/billing/web/subscription_detail.html.heex
@@ -366,7 +366,7 @@
               <%= if plan.uuid != @subscription.plan_uuid do %>
                 <option
                   value={plan.uuid}
-                  selected={to_string(@selected_new_plan_id) == to_string(plan.uuid)}
+                  selected={to_string(@selected_new_plan_uuid) == to_string(plan.uuid)}
                 >
                   {plan.name} - <.currency_compact amount={plan.price} currency={plan.currency} />
                   / {format_interval(plan.interval, plan.interval_count)}
@@ -391,7 +391,7 @@
             type="button"
             phx-click="change_plan"
             class="btn btn-primary"
-            disabled={is_nil(@selected_new_plan_id)}
+            disabled={is_nil(@selected_new_plan_uuid)}
           >
             <.icon name="hero-arrow-path" class="w-4 h-4" /> Change Plan
           </button>
diff --git a/lib/modules/billing/web/subscription_form.ex b/lib/modules/billing/web/subscription_form.ex
index e49237d8..4efdd33b 100644
--- a/lib/modules/billing/web/subscription_form.ex
+++ b/lib/modules/billing/web/subscription_form.ex
@@ -30,9 +30,9 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionForm do
         |> assign(:user_search, "")
         |> assign(:user_results, [])
         |> assign(:selected_user, nil)
-        |> assign(:selected_plan_id, nil)
+        |> assign(:selected_plan_uuid, nil)
         |> assign(:payment_methods, [])
-        |> assign(:selected_payment_method_id, nil)
+        |> assign(:selected_payment_method_uuid, nil)
         |> assign(:enable_trial, false)
         |> assign(:trial_days, "")
         |> assign(:error, nil)
@@ -76,7 +76,7 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionForm do
          |> assign(:user_search, user.email)
          |> assign(:user_results, [])
          |> assign(:payment_methods, payment_methods)
-         |> assign(:selected_payment_method_id, nil)}
+         |> assign(:selected_payment_method_uuid, nil)}
     end
   end
 
@@ -88,7 +88,7 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionForm do
      |> assign(:user_search, "")
      |> assign(:user_results, [])
      |> assign(:payment_methods, [])
-     |> assign(:selected_payment_method_id, nil)}
+     |> assign(:selected_payment_method_uuid, nil)}
   end
 
   @impl true
@@ -108,7 +108,7 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionForm do
 
     {:noreply,
      socket
-     |> assign(:selected_plan_id, plan_id)
+     |> assign(:selected_plan_uuid, plan_id)
      |> assign(:trial_days, trial_days)
      |> assign(:enable_trial, trial_days != "")}
   end
@@ -116,7 +116,7 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionForm do
   @impl true
   def handle_event("select_payment_method", %{"payment_method_id" => pm_id}, socket) do
     pm_id = if pm_id == "", do: nil, else: pm_id
-    {:noreply, assign(socket, :selected_payment_method_id, pm_id)}
+    {:noreply, assign(socket, :selected_payment_method_uuid, pm_id)}
   end
 
   @impl true
@@ -139,8 +139,8 @@ defmodule PhoenixKit.Modules.Billing.Web.SubscriptionForm do
   def handle_event("save", _params, socket) do
     %{
       selected_user: user,
-      selected_plan_id: plan_id,
-      selected_payment_method_id: pm_id,
+      selected_plan_uuid: plan_id,
+      selected_payment_method_uuid: pm_id,
       enable_trial: enable_trial,
       trial_days: trial_days
     } = socket.assigns
diff --git a/lib/modules/billing/web/subscription_form.html.heex b/lib/modules/billing/web/subscription_form.html.heex
index a5cf5a88..c0541126 100644
--- a/lib/modules/billing/web/subscription_form.html.heex
+++ b/lib/modules/billing/web/subscription_form.html.heex
@@ -125,7 +125,7 @@
                 <%= for plan <- @plans do %>
                   <option
                     value={plan.uuid}
-                    selected={to_string(@selected_plan_id) == to_string(plan.uuid)}
+                    selected={to_string(@selected_plan_uuid) == to_string(plan.uuid)}
                   >
                     {plan.name} -
                     <.currency_compact amount={plan.price} currency={plan.currency} />
@@ -194,7 +194,7 @@
                   <%= for pm <- @payment_methods do %>
                     <option
                       value={pm.uuid}
-                      selected={to_string(@selected_payment_method_id) == to_string(pm.uuid)}
+                      selected={to_string(@selected_payment_method_uuid) == to_string(pm.uuid)}
                     >
                       {format_payment_method(pm)}
                       <%= if pm.is_default do %>
@@ -225,7 +225,7 @@
             type="button"
             phx-click="save"
             class="btn btn-primary"
-            disabled={is_nil(@selected_user) || is_nil(@selected_plan_id)}
+            disabled={is_nil(@selected_user) || is_nil(@selected_plan_uuid)}
           >
             <.icon name="hero-plus" class="w-4 h-4" /> Create Subscription
           </button>
@@ -254,8 +254,9 @@
             <%!-- Plan --%>
             <div class="space-y-1">
               <div class="text-sm text-base-content/60">Plan</div>
-              <%= if @selected_plan_id do %>
-                <% plan = Enum.find(@plans, &(to_string(&1.uuid) == to_string(@selected_plan_id))) %>
+              <%= if @selected_plan_uuid do %>
+                <% plan =
+                  Enum.find(@plans, &(to_string(&1.uuid) == to_string(@selected_plan_uuid))) %>
                 <%= if plan do %>
                   <div class="font-medium">{plan.name}</div>
                   <div class="text-2xl font-bold mt-1">
@@ -278,14 +279,14 @@
               </div>
             <% end %>
 
-            <%= if @selected_payment_method_id do %>
+            <%= if @selected_payment_method_uuid do %>
               <div class="divider my-2"></div>
               <div class="space-y-1">
                 <div class="text-sm text-base-content/60">Payment Method</div>
                 <% pm =
                   Enum.find(
                     @payment_methods,
-                    &(to_string(&1.uuid) == to_string(@selected_payment_method_id))
+                    &(to_string(&1.uuid) == to_string(@selected_payment_method_uuid))
                   ) %>
                 <%= if pm do %>
                   <div class="font-medium">{format_payment_method(pm)}</div>
diff --git a/lib/modules/billing/web/user_billing_profile_form.ex b/lib/modules/billing/web/user_billing_profile_form.ex
index fe0397d6..d1219ab1 100644
--- a/lib/modules/billing/web/user_billing_profile_form.ex
+++ b/lib/modules/billing/web/user_billing_profile_form.ex
@@ -137,7 +137,7 @@ defmodule PhoenixKit.Modules.Billing.Web.UserBillingProfileForm do
   @impl true
   def render(assigns) do
     ~H"""
-    <PhoenixKitWeb.Layouts.dashboard {assigns}>
+    <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
       <div class="p-6 max-w-3xl mx-auto">
         <%!-- Header --%>
         <div class="flex items-center gap-4 mb-8">
diff --git a/lib/modules/billing/web/user_billing_profiles.ex b/lib/modules/billing/web/user_billing_profiles.ex
index 77237223..413daa2f 100644
--- a/lib/modules/billing/web/user_billing_profiles.ex
+++ b/lib/modules/billing/web/user_billing_profiles.ex
@@ -109,7 +109,7 @@ defmodule PhoenixKit.Modules.Billing.Web.UserBillingProfiles do
   @impl true
   def render(assigns) do
     ~H"""
-    <PhoenixKitWeb.Layouts.dashboard {assigns}>
+    <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
       <div class="p-6 max-w-4xl mx-auto">
         <%!-- Header --%>
         <div class="flex flex-col sm:flex-row justify-between items-start sm:items-center mb-8 gap-4">
diff --git a/lib/modules/emails/web/settings.ex b/lib/modules/emails/web/settings.ex
index 7edbe7d2..bc21ce57 100644
--- a/lib/modules/emails/web/settings.ex
+++ b/lib/modules/emails/web/settings.ex
@@ -38,6 +38,7 @@ defmodule PhoenixKit.Modules.Emails.Web.Settings do
   alias PhoenixKit.AWS.InfrastructureSetup
   alias PhoenixKit.Config.AWS
   alias PhoenixKit.Modules.Emails
+  alias PhoenixKit.Modules.Emails.SQSPollingJob
   alias PhoenixKit.Settings
   alias PhoenixKit.Utils.Routes
 
@@ -256,8 +257,6 @@ defmodule PhoenixKit.Modules.Emails.Web.Settings do
   end
 
   def handle_event("toggle_sqs_polling", _params, socket) do
-    alias PhoenixKit.Modules.Emails.SQSPollingJob
-
     # Toggle SQS polling
     new_sqs_polling = !socket.assigns.sqs_polling_enabled
 
diff --git a/lib/modules/publishing/storage.ex b/lib/modules/publishing/storage.ex
index 6bd54677..fb836089 100644
--- a/lib/modules/publishing/storage.ex
+++ b/lib/modules/publishing/storage.ex
@@ -22,6 +22,7 @@ defmodule PhoenixKit.Modules.Publishing.Storage do
   - `Storage.Helpers` - Shared utilities
   """
 
+  alias PhoenixKit.Modules.Languages.DialectMapper
   alias PhoenixKit.Modules.Publishing.Metadata
   alias PhoenixKit.Modules.Publishing.Storage.Deletion
   alias PhoenixKit.Modules.Publishing.Storage.Helpers
@@ -966,7 +967,6 @@ defmodule PhoenixKit.Modules.Publishing.Storage do
   defp base_code?(_), do: false
 
   defp find_dialect_for_base(available_languages, base_code) do
-    alias PhoenixKit.Modules.Languages.DialectMapper
     base_lower = String.downcase(base_code)
 
     Enum.find(available_languages, fn lang ->
diff --git a/lib/modules/publishing/storage/helpers.ex b/lib/modules/publishing/storage/helpers.ex
index f02c6277..32fd6310 100644
--- a/lib/modules/publishing/storage/helpers.ex
+++ b/lib/modules/publishing/storage/helpers.ex
@@ -7,6 +7,7 @@ defmodule PhoenixKit.Modules.Publishing.Storage.Helpers do
   """
 
   alias PhoenixKit.Modules.Publishing.Metadata
+  alias PhoenixKit.Modules.Publishing.Storage.Languages
 
   # ============================================================================
   # Audit Metadata Helpers
@@ -285,8 +286,6 @@ defmodule PhoenixKit.Modules.Publishing.Storage.Helpers do
   """
   @spec relative_path_with_language(String.t(), Date.t(), Time.t(), String.t()) :: String.t()
   def relative_path_with_language(group_slug, date, time, language_code) do
-    alias PhoenixKit.Modules.Publishing.Storage.Languages
-
     date_part = Date.to_iso8601(date)
     time_part = format_time_folder(time)
 
@@ -304,8 +303,6 @@ defmodule PhoenixKit.Modules.Publishing.Storage.Helpers do
           String.t()
         ) :: String.t()
   def relative_path_with_language_versioned(group_slug, date, time, version, language_code) do
-    alias PhoenixKit.Modules.Publishing.Storage.Languages
-
     date_part = Date.to_iso8601(date)
     time_part = format_time_folder(time)
 
diff --git a/lib/modules/publishing/storage/slugs.ex b/lib/modules/publishing/storage/slugs.ex
index f2bd168d..4d83742d 100644
--- a/lib/modules/publishing/storage/slugs.ex
+++ b/lib/modules/publishing/storage/slugs.ex
@@ -8,6 +8,7 @@ defmodule PhoenixKit.Modules.Publishing.Storage.Slugs do
 
   alias PhoenixKit.Modules.Publishing.ListingCache
   alias PhoenixKit.Modules.Publishing.Metadata
+  alias PhoenixKit.Modules.Publishing.Storage
   alias PhoenixKit.Modules.Publishing.Storage.Languages
   alias PhoenixKit.Modules.Publishing.Storage.Paths
   alias PhoenixKit.Modules.Publishing.Storage.Versions
@@ -151,8 +152,6 @@ defmodule PhoenixKit.Modules.Publishing.Storage.Slugs do
   end
 
   defp read_post_url_slug(group_slug, post_slug, language) do
-    alias PhoenixKit.Modules.Publishing.Storage
-
     case Storage.read_post_slug_mode(group_slug, post_slug, language, nil) do
       {:ok, post} ->
         url_slug = Map.get(post.metadata, :url_slug) || post_slug
diff --git a/lib/modules/publishing/web/editor/helpers.ex b/lib/modules/publishing/web/editor/helpers.ex
index 922612e7..9899f3ec 100644
--- a/lib/modules/publishing/web/editor/helpers.ex
+++ b/lib/modules/publishing/web/editor/helpers.ex
@@ -8,6 +8,7 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Helpers do
 
   alias PhoenixKit.Modules.Publishing
   alias PhoenixKit.Modules.Publishing.Storage
+  alias PhoenixKit.Modules.Publishing.Web.Editor.Translation
   alias PhoenixKit.Modules.Publishing.Web.HTML, as: PublishingHTML
   alias PhoenixKit.Modules.Storage.URLSigner
 
@@ -47,8 +48,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Helpers do
     global_primary = Storage.get_primary_language()
     global_primary_language_name = get_language_name(global_primary)
 
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Translation
-
     socket
     |> Phoenix.Component.assign(:current_language, language_code)
     |> Phoenix.Component.assign(:current_language_name, current_language_name)
diff --git a/lib/modules/publishing/web/editor/persistence.ex b/lib/modules/publishing/web/editor/persistence.ex
index 90378571..009375ce 100644
--- a/lib/modules/publishing/web/editor/persistence.ex
+++ b/lib/modules/publishing/web/editor/persistence.ex
@@ -13,6 +13,7 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Persistence do
   alias PhoenixKit.Modules.Publishing.PubSub, as: PublishingPubSub
   alias PhoenixKit.Modules.Publishing.Renderer
   alias PhoenixKit.Modules.Publishing.Storage
+  alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
   alias PhoenixKit.Utils.Routes
 
   require Logger
@@ -500,7 +501,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Persistence do
           Map.put(post, :language_statuses, updated_statuses)
       end
 
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
     form = Forms.post_form_with_primary_status(blog_slug, refreshed_post, current_version)
 
     is_published = form["status"] == "published"
@@ -747,8 +747,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Persistence do
     blog_slug = socket.assigns.blog_slug
     post_path = socket.assigns.post.path
 
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
-
     case Publishing.read_post(blog_slug, post_path) do
       {:ok, updated_post} ->
         current_version = socket.assigns[:current_version]
@@ -800,8 +798,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Persistence do
     post_path = socket.assigns.post.path
     current_version = socket.assigns[:current_version]
 
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
-
     case Publishing.read_post(blog_slug, post_path) do
       {:ok, updated_post} ->
         form = Forms.post_form_with_primary_status(blog_slug, updated_post, current_version)
diff --git a/lib/modules/publishing/web/editor/preview.ex b/lib/modules/publishing/web/editor/preview.ex
index 84be0243..5733d1c2 100644
--- a/lib/modules/publishing/web/editor/preview.ex
+++ b/lib/modules/publishing/web/editor/preview.ex
@@ -10,6 +10,8 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Preview do
 
   alias PhoenixKit.Modules.Publishing
   alias PhoenixKit.Modules.Publishing.Storage
+  alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
+  alias PhoenixKit.Modules.Publishing.Web.Editor.Helpers
   alias PhoenixKit.Utils.Routes
 
   # ============================================================================
@@ -208,8 +210,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Preview do
   end
 
   defp build_preview_form(metadata, mode, disk_post) do
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
-
     %{
       "title" => metadata[:title] || "",
       "status" => metadata[:status] || "draft",
@@ -247,9 +247,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Preview do
   defp apply_preview_assigns(socket, post, form, blog_slug, mode, data, disk_post) do
     language = post.language
 
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Helpers
-
     has_changes =
       case disk_post do
         nil -> true
@@ -364,8 +361,6 @@ defmodule PhoenixKit.Modules.Publishing.Web.Editor.Preview do
   end
 
   defp derive_datetime_fields(:timestamp, published_at) do
-    alias PhoenixKit.Modules.Publishing.Web.Editor.Forms
-
     with value when is_binary(value) and value != "" <- published_at,
          {:ok, dt, _offset} <- DateTime.from_iso8601(value) do
       floored = Forms.floor_datetime_to_minute(dt)
diff --git a/lib/modules/shop/web/cart_page.ex b/lib/modules/shop/web/cart_page.ex
index a8b928e0..e8ca189f 100644
--- a/lib/modules/shop/web/cart_page.ex
+++ b/lib/modules/shop/web/cart_page.ex
@@ -478,7 +478,7 @@ defmodule PhoenixKit.Modules.Shop.Web.CartPage do
   defp shop_layout(assigns) do
     ~H"""
     <%= if @authenticated do %>
-      <PhoenixKitWeb.Layouts.dashboard {assigns}>
+      <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
         {render_slot(@inner_block)}
       </PhoenixKitWeb.Layouts.dashboard>
     <% else %>
diff --git a/lib/modules/shop/web/catalog_category.ex b/lib/modules/shop/web/catalog_category.ex
index de21c428..50d9bba6 100644
--- a/lib/modules/shop/web/catalog_category.ex
+++ b/lib/modules/shop/web/catalog_category.ex
@@ -14,6 +14,8 @@ defmodule PhoenixKit.Modules.Shop.Web.CatalogCategory do
   alias PhoenixKit.Modules.Shop.Translations
   alias PhoenixKit.Modules.Shop.Web.Components.CatalogSidebar
   alias PhoenixKit.Modules.Shop.Web.Components.FilterHelpers
+  alias PhoenixKit.Modules.Storage
+  alias PhoenixKit.Modules.Storage.URLSigner
   alias PhoenixKit.Settings
   alias PhoenixKit.Utils.Routes
 
@@ -439,7 +441,7 @@ defmodule PhoenixKit.Modules.Shop.Web.CatalogCategory do
 
     ~H"""
     <%= if @authenticated do %>
-      <PhoenixKitWeb.Layouts.dashboard {assigns}>
+      <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
         {render_slot(@inner_block)}
       </PhoenixKitWeb.Layouts.dashboard>
     <% else %>
@@ -573,9 +575,6 @@ defmodule PhoenixKit.Modules.Shop.Web.CatalogCategory do
 
   # Get signed URL for Storage image
   defp get_storage_image_url(file_id, variant) do
-    alias PhoenixKit.Modules.Storage
-    alias PhoenixKit.Modules.Storage.URLSigner
-
     case Storage.get_file(file_id) do
       %{id: id} ->
         case Storage.get_file_instance_by_name(id, variant) do
diff --git a/lib/modules/shop/web/catalog_product.ex b/lib/modules/shop/web/catalog_product.ex
index 149ca01f..15d5809b 100644
--- a/lib/modules/shop/web/catalog_product.ex
+++ b/lib/modules/shop/web/catalog_product.ex
@@ -1000,7 +1000,7 @@ defmodule PhoenixKit.Modules.Shop.Web.CatalogProduct do
 
     ~H"""
     <%= if @authenticated do %>
-      <PhoenixKitWeb.Layouts.dashboard {assigns}>
+      <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
         {render_slot(@inner_block)}
       </PhoenixKitWeb.Layouts.dashboard>
     <% else %>
diff --git a/lib/modules/shop/web/checkout_complete.ex b/lib/modules/shop/web/checkout_complete.ex
index 82730556..af71b891 100644
--- a/lib/modules/shop/web/checkout_complete.ex
+++ b/lib/modules/shop/web/checkout_complete.ex
@@ -276,7 +276,7 @@ defmodule PhoenixKit.Modules.Shop.Web.CheckoutComplete do
   defp shop_layout(assigns) do
     ~H"""
     <%= if @authenticated do %>
-      <PhoenixKitWeb.Layouts.dashboard {assigns}>
+      <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
         {render_slot(@inner_block)}
       </PhoenixKitWeb.Layouts.dashboard>
     <% else %>
diff --git a/lib/modules/shop/web/checkout_page.ex b/lib/modules/shop/web/checkout_page.ex
index 98354f64..73403c36 100644
--- a/lib/modules/shop/web/checkout_page.ex
+++ b/lib/modules/shop/web/checkout_page.ex
@@ -610,7 +610,7 @@ defmodule PhoenixKit.Modules.Shop.Web.CheckoutPage do
   defp shop_layout(assigns) do
     ~H"""
     <%= if @authenticated do %>
-      <PhoenixKitWeb.Layouts.dashboard {assigns}>
+      <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
         {render_slot(@inner_block)}
       </PhoenixKitWeb.Layouts.dashboard>
     <% else %>
diff --git a/lib/modules/shop/web/components/catalog_sidebar.ex b/lib/modules/shop/web/components/catalog_sidebar.ex
index 4c4a6e8d..113505e3 100644
--- a/lib/modules/shop/web/components/catalog_sidebar.ex
+++ b/lib/modules/shop/web/components/catalog_sidebar.ex
@@ -9,6 +9,7 @@ defmodule PhoenixKit.Modules.Shop.Web.Components.CatalogSidebar do
   use Phoenix.Component
 
   alias PhoenixKit.Modules.Shop
+  alias PhoenixKit.Modules.Shop.Category
   alias PhoenixKit.Modules.Shop.Translations
   alias PhoenixKit.Modules.Shop.Web.Components.FilterHelpers
   alias PhoenixKitWeb.Components.Core.Icon
@@ -353,7 +354,6 @@ defmodule PhoenixKit.Modules.Shop.Web.Components.CatalogSidebar do
   end
 
   def sidebar_cat_icon(%{mode: "category"} = assigns) do
-    alias PhoenixKit.Modules.Shop.Category
     image_url = Category.get_image_url(assigns.category, size: "thumbnail")
     assigns = assign(assigns, :image_url, image_url)
 
diff --git a/lib/modules/shop/web/product_detail.ex b/lib/modules/shop/web/product_detail.ex
index 83a491fe..be097966 100644
--- a/lib/modules/shop/web/product_detail.ex
+++ b/lib/modules/shop/web/product_detail.ex
@@ -11,6 +11,8 @@ defmodule PhoenixKit.Modules.Shop.Web.ProductDetail do
   alias PhoenixKit.Modules.Shop
   alias PhoenixKit.Modules.Shop.Options
   alias PhoenixKit.Modules.Shop.Translations
+  alias PhoenixKit.Modules.Storage
+  alias PhoenixKit.Modules.Storage.URLSigner
   alias PhoenixKit.Utils.Routes
 
   @impl true
@@ -661,9 +663,6 @@ defmodule PhoenixKit.Modules.Shop.Web.ProductDetail do
   defp get_storage_image_url("http" <> _ = _url, _variant), do: nil
 
   defp get_storage_image_url(file_id, variant) do
-    alias PhoenixKit.Modules.Storage
-    alias PhoenixKit.Modules.Storage.URLSigner
-
     case Storage.get_file(file_id) do
       %{id: id} ->
         case Storage.get_file_instance_by_name(id, variant) do
diff --git a/lib/modules/shop/web/shop_catalog.ex b/lib/modules/shop/web/shop_catalog.ex
index a73d5110..20e5e769 100644
--- a/lib/modules/shop/web/shop_catalog.ex
+++ b/lib/modules/shop/web/shop_catalog.ex
@@ -12,6 +12,8 @@ defmodule PhoenixKit.Modules.Shop.Web.ShopCatalog do
   alias PhoenixKit.Modules.Shop.Translations
   alias PhoenixKit.Modules.Shop.Web.Components.CatalogSidebar
   alias PhoenixKit.Modules.Shop.Web.Components.FilterHelpers
+  alias PhoenixKit.Modules.Storage
+  alias PhoenixKit.Modules.Storage.URLSigner
   alias PhoenixKit.Utils.Routes
 
   @impl true
@@ -347,7 +349,7 @@ defmodule PhoenixKit.Modules.Shop.Web.ShopCatalog do
 
     ~H"""
     <%= if @authenticated do %>
-      <PhoenixKitWeb.Layouts.dashboard {assigns}>
+      <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
         {render_slot(@inner_block)}
       </PhoenixKitWeb.Layouts.dashboard>
     <% else %>
@@ -498,9 +500,6 @@ defmodule PhoenixKit.Modules.Shop.Web.ShopCatalog do
 
   # Get signed URL for Storage image
   defp get_storage_image_url(file_id, variant) do
-    alias PhoenixKit.Modules.Storage
-    alias PhoenixKit.Modules.Storage.URLSigner
-
     case Storage.get_file(file_id) do
       %{id: id} ->
         case Storage.get_file_instance_by_name(id, variant) do
diff --git a/lib/modules/shop/web/test_shop.ex b/lib/modules/shop/web/test_shop.ex
index 555d00a3..a90dd051 100644
--- a/lib/modules/shop/web/test_shop.ex
+++ b/lib/modules/shop/web/test_shop.ex
@@ -84,7 +84,7 @@ defmodule PhoenixKit.Modules.Shop.Web.TestShop do
   @impl true
   def render(assigns) do
     ~H"""
-    <PhoenixKitWeb.Layouts.dashboard {assigns}>
+    <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
       <div class="p-6 max-w-4xl mx-auto">
         <div class="flex justify-between items-center mb-6">
           <h1 class="text-2xl font-bold">
diff --git a/lib/modules/shop/web/user_order_details.html.heex b/lib/modules/shop/web/user_order_details.html.heex
index d45ec3b9..f24929f1 100644
--- a/lib/modules/shop/web/user_order_details.html.heex
+++ b/lib/modules/shop/web/user_order_details.html.heex
@@ -1,4 +1,4 @@
-<PhoenixKitWeb.Layouts.dashboard {assigns}>
+<PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
   <div class="container mx-auto">
     <%!-- Back Button --%>
     <div class="mb-6">
diff --git a/lib/modules/shop/web/user_orders.html.heex b/lib/modules/shop/web/user_orders.html.heex
index 0d06ab04..4669e435 100644
--- a/lib/modules/shop/web/user_orders.html.heex
+++ b/lib/modules/shop/web/user_orders.html.heex
@@ -1,4 +1,4 @@
-<PhoenixKitWeb.Layouts.dashboard {assigns}>
+<PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
   <div class="container mx-auto">
     <%!-- Header --%>
     <div class="flex flex-col md:flex-row md:items-center md:justify-between mb-6">
diff --git a/lib/modules/tickets/web/user_details.html.heex b/lib/modules/tickets/web/user_details.html.heex
index 7f482438..0d2e8898 100644
--- a/lib/modules/tickets/web/user_details.html.heex
+++ b/lib/modules/tickets/web/user_details.html.heex
@@ -1,4 +1,4 @@
-<PhoenixKitWeb.Layouts.dashboard {assigns}>
+<PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
   <div class="container mx-auto">
     <%!-- Back Button --%>
     <div class="mb-6">
diff --git a/lib/modules/tickets/web/user_list.html.heex b/lib/modules/tickets/web/user_list.html.heex
index ee3f1248..d6ee41f3 100644
--- a/lib/modules/tickets/web/user_list.html.heex
+++ b/lib/modules/tickets/web/user_list.html.heex
@@ -1,4 +1,4 @@
-<PhoenixKitWeb.Layouts.dashboard {assigns}>
+<PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
   <div class="container mx-auto">
     <%!-- Header --%>
     <div class="flex flex-col md:flex-row md:items-center md:justify-between mb-6">
diff --git a/lib/modules/tickets/web/user_new.html.heex b/lib/modules/tickets/web/user_new.html.heex
index 20889f0c..60e696e4 100644
--- a/lib/modules/tickets/web/user_new.html.heex
+++ b/lib/modules/tickets/web/user_new.html.heex
@@ -1,4 +1,4 @@
-<PhoenixKitWeb.Layouts.dashboard {assigns}>
+<PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
   <div class="max-w-2xl mx-auto">
     <%!-- Back Button --%>
     <div class="mb-6">
diff --git a/lib/phoenix_kit_web/live/dashboard/index.ex b/lib/phoenix_kit_web/live/dashboard/index.ex
index 2a767ad7..f3c159dd 100644
--- a/lib/phoenix_kit_web/live/dashboard/index.ex
+++ b/lib/phoenix_kit_web/live/dashboard/index.ex
@@ -17,7 +17,7 @@ defmodule PhoenixKitWeb.Live.Dashboard.Index do
   @impl Phoenix.LiveView
   def render(assigns) do
     ~H"""
-    <PhoenixKitWeb.Layouts.dashboard {assigns}>
+    <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
       <div class="flex flex-col items-center justify-center min-h-[60vh] text-center">
         <div class="max-w-2xl mx-auto">
           <h2 class="text-4xl font-bold text-base-content mb-4">
diff --git a/lib/phoenix_kit_web/live/dashboard/settings.ex b/lib/phoenix_kit_web/live/dashboard/settings.ex
index 11b6018f..3811a25d 100644
--- a/lib/phoenix_kit_web/live/dashboard/settings.ex
+++ b/lib/phoenix_kit_web/live/dashboard/settings.ex
@@ -653,7 +653,7 @@ defmodule PhoenixKitWeb.Live.Dashboard.Settings do
   @impl Phoenix.LiveView
   def render(assigns) do
     ~H"""
-    <PhoenixKitWeb.Layouts.dashboard {assigns}>
+    <PhoenixKitWeb.Layouts.dashboard {dashboard_assigns(assigns)}>
       <div class="max-w-6xl mx-auto">
         <!-- Development Mode Notice -->
         <div :if={show_dev_notice?()} class="mb-6">