diff --git a/main.go b/main.go
index 373ac13..7778723 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/joho/godotenv"
 	"github.com/urfave/cli"
 )
 
@@ -125,6 +126,10 @@ func run(c *cli.Context) error {
 		"Revision": revision,
 	}).Info("Drone Terraform Plugin Version")
 
+	if c.String("env_file") != "" {
+		_ = godotenv.Load(c.String("env_file"))
+	}
+
 	var vars map[string]string
 	if c.String("vars") != "" {
 		if err := json.Unmarshal([]byte(c.String("vars")), &vars); err != nil {
@@ -157,7 +162,6 @@ func run(c *cli.Context) error {
 			Parallelism:      c.Int("parallelism"),
 			Targets:          c.StringSlice("targets"),
 			VarFiles:         c.StringSlice("var_files"),
-			EnvFile:          c.String("env_file"),
 			TerraformDataDir: c.String("tf_data_dir"),
 		},
 		Netrc: Netrc{
diff --git a/plugin.go b/plugin.go
index 19554e9..3d513fb 100644
--- a/plugin.go
+++ b/plugin.go
@@ -16,7 +16,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sts"
-	"github.com/joho/godotenv"
 )
 
 type (
@@ -34,7 +33,6 @@ type (
 		Parallelism      int
 		Targets          []string
 		VarFiles         []string
-		EnvFile          string
 		TerraformDataDir string
 	}
 
@@ -79,10 +77,6 @@ func (p Plugin) Exec() error {
 		}
 	}
 
-	if p.Config.EnvFile != "" {
-		_ = godotenv.Load(p.Config.EnvFile)
-	}
-
 	if p.Config.RoleARN != "" {
 		assumeRole(p.Config.RoleARN)
 	}