diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index 1df58966..02752362 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -135,7 +135,12 @@ func DeployOverview(app config.App, version string) error {
 		deployConfig = strings.Join(strings.Split(composeFiles, ":"), "\n")
 	}
 
-	table.Append([]string{app.Server, deployConfig, app.Domain, app.StackName(), version})
+	server := app.Server
+	if app.Server == "default" {
+		server = "local"
+	}
+
+	table.Append([]string{server, deployConfig, app.Domain, app.StackName(), version})
 	table.Render()
 
 	response := false
@@ -164,7 +169,12 @@ func NewVersionOverview(app config.App, currentVersion, newVersion string) error
 		deployConfig = strings.Join(strings.Split(composeFiles, ":"), "\n")
 	}
 
-	table.Append([]string{app.Server, deployConfig, app.Domain, app.StackName(), currentVersion, newVersion})
+	server := app.Server
+	if app.Server == "default" {
+		server = "local"
+	}
+
+	table.Append([]string{server, deployConfig, app.Domain, app.StackName(), currentVersion, newVersion})
 	table.Render()
 
 	response := false
diff --git a/cli/app/new.go b/cli/app/new.go
index 2b3cb168..2166860a 100644
--- a/cli/app/new.go
+++ b/cli/app/new.go
@@ -210,6 +210,10 @@ func action(c *cli.Context) error {
 		}
 	}
 
+	if newAppServer == "default" {
+		newAppServer = "local"
+	}
+
 	tableCol := []string{"Name", "Domain", "Type", "Server"}
 	table := abraFormatter.CreateTable(tableCol)
 	table.Append([]string{sanitisedAppName, domain, recipe.Name, newAppServer})