diff --git a/lib/towerops_web/channels/agent_channel.ex b/lib/towerops_web/channels/agent_channel.ex
index a223feb2..5d605e37 100644
--- a/lib/towerops_web/channels/agent_channel.ex
+++ b/lib/towerops_web/channels/agent_channel.ex
@@ -359,7 +359,6 @@ defmodule ToweropsWeb.AgentChannel do
          {:ok, heartbeat} <- Validator.validate_heartbeat(binary) do
       metadata = %{
         "version" => heartbeat.version,
-        "hostname" => heartbeat.hostname,
         "uptime_seconds" => heartbeat.uptime_seconds
       }
 
diff --git a/lib/towerops_web/live/agent_live/index.html.heex b/lib/towerops_web/live/agent_live/index.html.heex
index c40d7634..c4293c13 100644
--- a/lib/towerops_web/live/agent_live/index.html.heex
+++ b/lib/towerops_web/live/agent_live/index.html.heex
@@ -132,12 +132,6 @@
               {format_agent_version(agent.metadata["version"])}
             </div>
           <% end %>
-          <%= if agent.metadata["hostname"] do %>
-            <div class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
-              <.icon name="hero-computer-desktop" class="h-3.5 w-3.5 inline" />
-              {agent.metadata["hostname"]}
-            </div>
-          <% end %>
         </:col>
 
         <:col :let={{_id, agent}} label="Created">
@@ -249,12 +243,6 @@
               {format_agent_version(agent.metadata["version"])}
             </div>
           <% end %>
-          <%= if agent.metadata["hostname"] do %>
-            <div class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
-              <.icon name="hero-computer-desktop" class="h-3.5 w-3.5 inline" />
-              {agent.metadata["hostname"]}
-            </div>
-          <% end %>
         </:col>
 
         <:col :let={{_id, agent}} label="Created">
diff --git a/lib/towerops_web/live/agent_live/show.html.heex b/lib/towerops_web/live/agent_live/show.html.heex
index 915e3051..165f176a 100644
--- a/lib/towerops_web/live/agent_live/show.html.heex
+++ b/lib/towerops_web/live/agent_live/show.html.heex
@@ -219,14 +219,6 @@
               </dd>
             </div>
           <% end %>
-          <%= if @agent_token.metadata["hostname"] do %>
-            <div>
-              <dt class="text-sm font-medium text-gray-600 dark:text-gray-400">Hostname</dt>
-              <dd class="mt-1 text-sm text-gray-900 dark:text-white font-mono">
-                {@agent_token.metadata["hostname"]}
-              </dd>
-            </div>
-          <% end %>
           <%= if @agent_token.metadata["uptime_seconds"] do %>
             <div>
               <dt class="text-sm font-medium text-gray-600 dark:text-gray-400">Uptime</dt>