diff --git a/lib/livebook_web/live/hub/teams/deployment_group_agent_component.ex b/lib/livebook_web/live/hub/teams/deployment_group_agent_component.ex
index 493a69e40..fce1a66df 100644
--- a/lib/livebook_web/live/hub/teams/deployment_group_agent_component.ex
+++ b/lib/livebook_web/live/hub/teams/deployment_group_agent_component.ex
@@ -45,16 +45,9 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
         App server setup
       </h3>
 
-      <p class="text-gray-700">
-        App server is an instance of Livebook where you can deploy Livebook
-        apps via Livebook Teams. Each app server belongs to a specific
-        deployment group.
-      </p>
-
-      <p class="mb-5 text-gray-700">
-        Use the instructions below to set up an instance in your own infrastructure.
-        Once the instance is running, it will connect to Livebook Teams and become
-        available for app deployments.
+      <p class="text-gray-700 mb-2">
+        App servers are instances of Livebook running inside your infrastructure
+        that you deploy your apps to. Follow the instructions below to start new instances.
       </p>
 
       <div :if={@messages != []} class="flex flex-col gap-2">
@@ -63,8 +56,17 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
         </.message_box>
       </div>
 
+      <.form :let={f} for={@changeset} as={:data} phx-change="validate" phx-target={@myself}>
+        <.radio_field
+          label="Base Docker image"
+          field={f[:docker_tag]}
+          options={LivebookWeb.AppComponents.docker_tag_options()}
+        />
+      </.form>
+
       <.form
         :let={f}
+        :if={match?([_, _ | _], @deployment_group.agent_keys)}
         for={%{"id" => @agent_key_id}}
         as={:agent_key}
         phx-change="select_agent_key"
@@ -83,16 +85,8 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
         </div>
       </.form>
 
-      <.form :let={f} for={@changeset} as={:data} phx-change="validate" phx-target={@myself}>
-        <.radio_field
-          label="Base image"
-          field={f[:docker_tag]}
-          options={LivebookWeb.AppComponents.docker_tag_options()}
-        />
-      </.form>
-
       <%= if @agent_key_id do %>
-        <div class="mt-5">
+        <div class="mt-2">
           <.tabs id="deployment-instruction" default="docker">
             <:tab id="docker" label="Docker">
               <div class="flex flex-col gap-3">
@@ -117,7 +111,7 @@ defmodule LivebookWeb.Hub.Teams.DeploymentGroupAgentComponent do
             <:tab id="fly_io" label="Fly.io">
               <div class="flex flex-col gap-3">
                 <p class="text-gray-700">
-                  Deploy an app server to Fly.io with a few simple commands.
+                  Deploy an app server to Fly.io with a few commands.
                 </p>
                 <div>
                   <div class="flex items-end mb-1 gap-1">
diff --git a/lib/livebook_web/live/session_live/app_teams_live.ex b/lib/livebook_web/live/session_live/app_teams_live.ex
index 5320b386c..b4f7a7b0b 100644
--- a/lib/livebook_web/live/session_live/app_teams_live.ex
+++ b/lib/livebook_web/live/session_live/app_teams_live.ex
@@ -152,8 +152,8 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
             </.message_box>
           <% else %>
             <.message_box kind={:info}>
-              Awaiting an app server to be set up. If you deploy the app,
-              it will only start once there is an app server to run it.
+              Awaiting an app server to be set up. If you click "Deploy anyway",
+              the app will only start once there is an app server.
             </.message_box>
           <% end %>
           <div class="flex gap-2">
@@ -180,15 +180,14 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
     ~H"""
     <div class="flex flex-col gap-6">
       <p class="text-gray-700">
-        Deploy this app to your cloud infrastructure. The app will be pushed to the Livebook
-        Teams app servers associated with the deployment group that you choose.
+        Deploy this app to your cloud infrastructure using the <.workspace hub={@hub} /> workspace.
       </p>
 
       <%= if @deployment_group do %>
         <div class="flex flex-col gap-2">
           <div class="flex justify-between items-center">
             <p class="text-gray-700">
-              Using deployment group in <.workspace hub={@hub} /> workspace:
+              Deploying to:
             </p>
             <button class="font-medium text-blue-600" phx-click="unselect_deployment_group">
               Change
@@ -205,13 +204,13 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
         </div>
 
         <div :if={@app_deployment} class="space-y-3">
-          <p class="text-gray-700">Currently deployed version:</p>
+          <p class="text-gray-700">Current version:</p>
           <.app_deployment_card app_deployment={@app_deployment} />
         </div>
 
         <.message_box :if={@num_agents[@deployment_group.id] == nil} kind={:warning}>
-          The selected deployment group has no app servers. If you deploy the app,
-          it will only start once there is an app server to run it.
+          The selected deployment group has no app servers. If you click "Deploy anyway",
+          the app will only start once there is an app server.
         </.message_box>
 
         <%= if @num_agents[@deployment_group.id] do %>
@@ -243,7 +242,7 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
 
         <div :if={@deployment_groups != []} class="flex flex-col gap-2">
           <p class="text-gray-700">
-            Online deployment groups in <.workspace hub={@hub} /> workspace:
+            Choose a deployment group:
           </p>
           <div class="flex flex-col gap-3">
             <.deployment_group_entry
@@ -341,6 +340,9 @@ defmodule LivebookWeb.SessionLive.AppTeamsLive do
   defp app_deployment_card(assigns) do
     ~H"""
     <div class="flex gap-4 sm:gap-12 border border-gray-200 rounded-lg p-4">
+      <.labeled_text label="Slug">
+        /<%= @app_deployment.slug %>
+      </.labeled_text>
       <.labeled_text label="Title">
         <%= @app_deployment.title %>
       </.labeled_text>