diff --git a/cli/app/rollback.go b/cli/app/rollback.go
index 36d3c365..9c226980 100644
--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@@ -178,6 +178,7 @@ recipes.
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		config.ExposeAllEnv(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 127497dc..18917761 100644
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@@ -189,6 +189,7 @@ recipes.
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		config.ExposeAllEnv(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 fe8a2ab0..99fc9e6c 100644
--- a/cli/internal/deploy.go
+++ b/cli/internal/deploy.go
@@ -134,6 +134,7 @@ func DeployAction(c *cli.Context) error {
 	if err != nil {
 		logrus.Fatal(err)
 	}
+	config.ExposeAllEnv(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 b0d8b530..25aa10c1 100644
--- a/pkg/config/app.go
+++ b/pkg/config/app.go
@@ -445,8 +445,6 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv AppEnv) (*comp
 
 	logrus.Debugf("retrieved %s for %s", compose.Filename, recipe)
 
-	ExposeAllEnv(compose, appEnv)
-
 	return compose, nil
 }