diff --git a/cmd/drone-docker/main.go b/cmd/drone-docker/main.go
index 2cbb5ce..e720fe7 100644
--- a/cmd/drone-docker/main.go
+++ b/cmd/drone-docker/main.go
@@ -209,9 +209,9 @@ func main() {
 			EnvVar: "PLUGIN_EMAIL,DOCKER_EMAIL",
 		},
 		cli.StringFlag{
-			Name:   "docker.authconfig",
-			Usage:  "docker json authconfig content",
-			EnvVar: "PLUGIN_AUTHCONFIG,DOCKER_AUTHCONFIG",
+			Name:   "docker.docker_config",
+			Usage:  "docker json dockerconfig content",
+			EnvVar: "PLUGIN_DOCKER_CONFIG,DOCKER_CONFIG",
 		},
 		cli.BoolTFlag{
 			Name:   "docker.purge",
@@ -249,7 +249,7 @@ func run(c *cli.Context) error {
 			Username:   c.String("docker.username"),
 			Password:   c.String("docker.password"),
 			Email:      c.String("docker.email"),
-			AuthConfig: c.String("docker.authconfig"),
+			DockerConfig: c.String("docker.docker_config"),
 		},
 		Build: docker.Build{
 			Remote:      c.String("remote.url"),
diff --git a/daemon.go b/daemon.go
index 5bf1119..09234ff 100644
--- a/daemon.go
+++ b/daemon.go
@@ -9,6 +9,7 @@ import (
 
 const dockerExe = "/usr/local/bin/docker"
 const dockerdExe = "/usr/local/bin/dockerd"
+const dockerrootconfdir = "/root/.docker/"
 
 func (p Plugin) startDaemon() {
 	cmd := commandDaemon(p.Daemon)
diff --git a/daemon_win.go b/daemon_win.go
index 062cf5e..b435f5b 100644
--- a/daemon_win.go
+++ b/daemon_win.go
@@ -4,6 +4,7 @@ package docker
 
 const dockerExe = "C:\\bin\\docker.exe"
 const dockerdExe = ""
+const dockerrootconfdir = "C:\\ProgramData\\docker\"
 
 func (p Plugin) startDaemon() {
 	// this is a no-op on windows
diff --git a/docker.go b/docker.go
index 6209650..d472f10 100644
--- a/docker.go
+++ b/docker.go
@@ -6,6 +6,7 @@ import (
 	"os/exec"
 	"strings"
 	"time"
+	"io/ioutil"
 )
 
 type (
@@ -32,7 +33,7 @@ type (
 		Username   string // Docker registry username
 		Password   string // Docker registry password
 		Email      string // Docker registry email
-		AuthConfig string // Docker Auth Config
+		DockerConfig string // Docker Auth Config
 	}
 
 	// Build defines Docker build parameters.
@@ -85,32 +86,19 @@ func (p Plugin) Exec() error {
 	}
 
 	// Create Auth Config File
-	if p.Login.AuthConfig != "" {
-		fmt.Println("AuthConfig provided.")
-		err_mkdir := os.MkdirAll("/root/.docker", 0600)
+	if p.Login.DockerConfig != "" {
+		fmt.Println("DockerConfig provided.")
+		err_mkdir := os.MkdirAll(dockerrootconfdir, 0600)
 		if err_mkdir != nil {
 			fmt.Println("Error creating root's docker auth config directory: ")
 			fmt.Println(err_mkdir)
 		}
-		cfile, err_create := os.Create("/root/.docker/config.json")
-		if err_create != nil {
-			fmt.Println("Error creating root's docker auth config file: ")
-			fmt.Println(err_create)
-			cfile.Close()
+		conffile := fmt.Sprintf("%s%s", dockerrootconfdir, "config.json")
+		err_mkconf := ioutil.WriteFile(conffile, []byte(p.Login.DockerConfig), 0600)
+		if err_mkconf != nil {
+			fmt.Println("Error creating root's docker auth configuration: ")
+			fmt.Println(err_mkconf)
 		}
-		err_chmod := os.Chmod("/root/.docker/config.json", 0600)
-		if err_chmod != nil {
-			fmt.Println("Error setting permissions on root's docker auth config file: ")
-			fmt.Println(err_chmod)
-		}
-		_, err_str := cfile.WriteString(p.Login.AuthConfig)
-		if err_str != nil {
-			fmt.Println("Error filling root's docker auth config file: ")
-			fmt.Println(err_str)
-		} else {
-			cfile.Close()
-		}
-
 	}
 
 	// login to the Docker registry
@@ -120,8 +108,10 @@ func (p Plugin) Exec() error {
 		if err != nil {
 			return fmt.Errorf("Error authenticating: %s", err)
 		}
-	} else {
-		fmt.Println("Registry credentials not provided. Guest mode enabled.")
+	} 
+
+	if p.Login.Password != "" && p.Login.DockerConfig != "" {
+		fmt.Println("Registry credentials or Docker config not provided. Guest mode enabled.")
 	}
 	
 	if p.Build.Squash && !p.Daemon.Experimental {