diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index 2f4741a7..f5a400d9 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -32,17 +32,13 @@ var appDeployCommand = &cli.Command{
 			app.Env[k] = v
 		}
 
-		if _, exists := app.Env["STACK_NAME"]; !exists {
-			app.Env["STACK_NAME"] = app.StackName()
-		}
-
 		composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
-			Namespace:    app.Env["STACK_NAME"],
+			Namespace:    app.StackName(),
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
 		}
diff --git a/cli/app/list.go b/cli/app/list.go
index 142194de..4af04f45 100644
--- a/cli/app/list.go
+++ b/cli/app/list.go
@@ -88,10 +88,6 @@ can take some time.
 				tableRow = []string{app.Server, app.Type, app.Domain}
 				if status {
 					stackName := app.StackName()
-					if app.Env["STACK_NAME"] != "" {
-						stackName = app.Env["STACK_NAME"]
-					}
-
 					status := "unknown"
 					version := "unknown"
 					if statusMeta, ok := statuses[stackName]; ok {
diff --git a/cli/app/ps.go b/cli/app/ps.go
index 7fa28530..593b7481 100644
--- a/cli/app/ps.go
+++ b/cli/app/ps.go
@@ -27,12 +27,8 @@ var appPsCommand = &cli.Command{
 			logrus.Fatal(err)
 		}
 
-		if _, exists := app.Env["STACK_NAME"]; !exists {
-			app.Env["STACK_NAME"] = app.StackName()
-		}
-
 		filters := filters.NewArgs()
-		filters.Add("name", app.Env["STACK_NAME"])
+		filters.Add("name", app.StackName())
 
 		containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
 		if err != nil {
diff --git a/pkg/config/app.go b/pkg/config/app.go
index e97ae70a..b246f47c 100644
--- a/pkg/config/app.go
+++ b/pkg/config/app.go
@@ -46,6 +46,9 @@ type App struct {
 
 // StackName gets what the docker safe stack name is for the app
 func (a App) StackName() string {
+	if a.Env["STACK_NAME"] != "" {
+		return a.Env["STACK_NAME"]
+	}
 	return SanitiseAppName(a.Name)
 }