2 files changed, 24 insertions, 3 deletions

diff --git a/cmd/ship/commands_v2.go b/cmd/ship/commands_v2.go
index 26ee1d3..1b0d09c 100644
--- a/cmd/ship/commands_v2.go
+++ b/cmd/ship/commands_v2.go
@@ -51,9 +51,16 @@ func runListV2(cmd *cobra.Command, args []string) error {
                         continue
                 }
                 
+                // Get actual domain from Caddyfile (first word of first line)
+                domain := fmt.Sprintf("%s.%s", name, hostConfig.BaseDomain)
+                caddyOut, _ := client.Run(fmt.Sprintf("head -1 /etc/caddy/sites-enabled/%s.caddy 2>/dev/null | awk '{print $1}'", name))
+                if d := strings.TrimSpace(caddyOut); d != "" && d != "{" {
+                        domain = d
+                }
+
                 info := output.DeployInfo{
                         Name: name,
-                        URL:  fmt.Sprintf("https://%s.%s", name, hostConfig.BaseDomain),
+                        URL:  fmt.Sprintf("https://%s", domain),
                 }
 
                 // Check if it's docker or binary
@@ -98,9 +105,16 @@ func runListV2(cmd *cobra.Command, args []string) error {
                         continue
                 }
 
+                // Get actual domain from Caddyfile
+                domain := fmt.Sprintf("%s.%s", name, hostConfig.BaseDomain)
+                caddyOut, _ := client.Run(fmt.Sprintf("head -1 /etc/caddy/sites-enabled/%s.caddy 2>/dev/null | awk '{print $1}'", name))
+                if d := strings.TrimSpace(caddyOut); d != "" && d != "{" {
+                        domain = d
+                }
+
                 info := output.DeployInfo{
                         Name:    name,
-                        URL:     fmt.Sprintf("https://%s.%s", name, hostConfig.BaseDomain),
+                        URL:     fmt.Sprintf("https://%s", domain),
                         Type:    "static",
                         Running: true, // Static sites are always "running"
                 }
@@ -163,10 +177,17 @@ func runStatusV2(cmd *cobra.Command, args []string) error {
                 output.PrintAndExit(output.ErrWithName(output.ErrNotFound, "deployment not found", name))
         }
 
+        // Get actual domain from Caddyfile
+        domain := fmt.Sprintf("%s.%s", name, hostConfig.BaseDomain)
+        caddyOut, _ := client.Run(fmt.Sprintf("head -1 /etc/caddy/sites-enabled/%s.caddy 2>/dev/null | awk '{print $1}'", name))
+        if d := strings.TrimSpace(caddyOut); d != "" && d != "{" {
+                domain = d
+        }
+
         resp := &output.StatusResponse{
                 Status: "ok",
                 Name:   name,
-                URL:    fmt.Sprintf("https://%s.%s", name, hostConfig.BaseDomain),
+                URL:    fmt.Sprintf("https://%s", domain),
         }
 
         // Determine type and get details
diff --git a/ship-new b/ship-new
index cd3667d..39e3473 100755
--- a/ship-new
+++ b/ship-new