diff --git a/README.md b/README.md
index 251dacb910d9e4562ea1e3ee5428a4ea7156b852..3a78c8befe8d2c69db1f1b6c8a4d731b26d32dbc 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ $ docker-machine create \
 - `--hetzner-ssh-user`: Change the default SSH-User
 - `--hetzner-ssh-port`: Change the default SSH-Port
 - `--hetzner-primary-ipv4/6`: Sets an existing primary IP (v4 or v6 respectively) for the server, as documented in [Networking](#networking)
-- `--wait-on-error`: Amount of seconds to wait on server creation failure (0/no wait by default)
+- `--hetzner-wait-on-error`: Amount of seconds to wait on server creation failure (0/no wait by default)
 
 #### Existing SSH keys
 
@@ -159,7 +159,7 @@ was used during creation.
 | `--hetzner-ssh-port`            | `HETZNER_SSH_PORT`            | 22                         |
 | `--hetzner-primary-ipv4`        | `HETZNER_PRIMARY_IPV4`        |                            |
 | `--hetzner-primary-ipv6`        | `HETZNER_PRIMARY_IPV6`        |                            |
-| `--wait-on-error`               | `WAIT_ON_ERROR`               | 0                          |
+| `--hetzner-wait-on-error`       | `HETZNER_WAIT_ON_ERROR`       | 0                          |
 
 #### Networking
 
diff --git a/driver.go b/driver.go
index 1a241f18169ee4e4fa910a7ed9ca6d1888b450c0..a61541e4cc8aab27f16b4bee928b4b53e3ca180f 100644
--- a/driver.go
+++ b/driver.go
@@ -102,7 +102,7 @@ const (
 	defaultSSHPort = 22
 	defaultSSHUser = "root"
 
-	flagWaitOnError    = "wait-on-error"
+	flagWaitOnError    = "hetzner-wait-on-error"
 	defaultWaitOnError = 0
 
 	legacyFlagUserDataFromFile = "hetzner-user-data-from-file"
@@ -275,7 +275,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Value:  defaultSSHPort,
 		},
 		mcnflag.IntFlag{
-			EnvVar: "WAIT_ON_ERROR",
+			EnvVar: "HETZNER_WAIT_ON_ERROR",
 			Name:   flagWaitOnError,
 			Usage:  "Wait if an error happens while creating the server",
 			Value:  defaultWaitOnError,