diff --git a/README.md b/README.md
index 777f5f9..8bf7278 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ Execute from the working directory:
 
 ```sh
 docker run --rm \
-  -e PLUGIN_FROM_ADDRESS=drone@test.test \
-  -e PLUGIN_FROM_NAME="John Smith" \
+  -e PLUGIN_FROM.ADDRESS=drone@test.test \
+  -e PLUGIN_FROM.NAME="John Smith" \
   -e PLUGIN_HOST=smtp.test.test \
   -e PLUGIN_USERNAME=drone \
   -e PLUGIN_PASSWORD=test \
diff --git a/main.go b/main.go
index 5f94678..8e729a0 100644
--- a/main.go
+++ b/main.go
@@ -33,12 +33,12 @@ func main() {
 		cli.StringFlag{
 			Name:   "from.address",
 			Usage:  "from address",
-			EnvVar: "PLUGIN_FROM_ADDRESS",
+			EnvVar: "PLUGIN_FROM.ADDRESS",
 		},
 		cli.StringFlag{
 			Name:   "from.name",
 			Usage:  "from name",
-			EnvVar: "PLUGIN_FROM_NAME",
+			EnvVar: "PLUGIN_FROM.NAME",
 		},
 		cli.StringFlag{
 			Name:   "host",