diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index 300311d4d..2f4741a76 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -31,7 +31,10 @@ var appDeployCommand = &cli.Command{
 		for k, v := range abraShEnv {
 			app.Env[k] = v
 		}
-		app.Env["STACK_NAME"] = app.StackName()
+
+		if _, exists := app.Env["STACK_NAME"]; !exists {
+			app.Env["STACK_NAME"] = app.StackName()
+		}
 
 		composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
 		if err != nil {
@@ -39,7 +42,7 @@ var appDeployCommand = &cli.Command{
 		}
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
-			Namespace:    app.StackName(),
+			Namespace:    app.Env["STACK_NAME"],
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
 		}