diff --git a/cli/app/rollback.go b/cli/app/rollback.go
index 9c226980..98acf56f 100644
--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@@ -178,7 +178,7 @@ recipes.
 		if err != nil {
 			logrus.Fatal(err)
 		}
-		config.ExposeAllEnv(compose, app.Env)
+		config.ExposeAllEnv(stackName, compose, app.Env)
 
 		if !internal.Force {
 			if err := internal.NewVersionOverview(app, deployedVersion, chosenDowngrade, ""); err != nil {
diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go
index 18917761..fa46b8d3 100644
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@@ -189,7 +189,7 @@ recipes.
 		if err != nil {
 			logrus.Fatal(err)
 		}
-		config.ExposeAllEnv(compose, app.Env)
+		config.ExposeAllEnv(stackName, compose, app.Env)
 
 		if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade, releaseNotes); err != nil {
 			logrus.Fatal(err)
diff --git a/cli/internal/deploy.go b/cli/internal/deploy.go
index 99fc9e6c..6b3047fb 100644
--- a/cli/internal/deploy.go
+++ b/cli/internal/deploy.go
@@ -134,7 +134,7 @@ func DeployAction(c *cli.Context) error {
 	if err != nil {
 		logrus.Fatal(err)
 	}
-	config.ExposeAllEnv(compose, app.Env)
+	config.ExposeAllEnv(app.StackName(), compose, app.Env)
 
 	if err := DeployOverview(app, version, "continue with deployment?"); err != nil {
 		logrus.Fatal(err)
diff --git a/pkg/config/app.go b/pkg/config/app.go
index 8f3fecd8..15253634 100644
--- a/pkg/config/app.go
+++ b/pkg/config/app.go
@@ -448,17 +448,17 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv AppEnv) (*comp
 	return compose, nil
 }
 
-// expose all env variables to the app container
-func ExposeAllEnv(compose *composetypes.Config, appEnv AppEnv) {
+// ExposeAllEnv exposes all env variables to the app container
+func ExposeAllEnv(stackName string, compose *composetypes.Config, appEnv AppEnv) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			logrus.Debug("Add the following environment to the app service config:")
+			logrus.Debugf("Add the following environment to the app service config of %s:", stackName)
 			for k, v := range appEnv {
 				_, exists := service.Environment[k]
 				if !exists {
 					value := v
 					service.Environment[k] = &value
-					logrus.Debugf("Add Key: %s Value: %s", k, value)
+					logrus.Debugf("Add Key: %s Value: %s to %s", k, value, stackName)
 				}
 			}
 		}