diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 3beef3c5..008225b0 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -1,4 +1,4 @@
-FROM golang:1.9.3
+FROM golang:1.9.4
 RUN apt-get update && \
     apt-get install -y xz-utils zip rsync
 RUN go get github.com/rancher/trash
diff --git a/cmd/prompt.go b/cmd/prompt.go
index 12596a15..0660d3a3 100644
--- a/cmd/prompt.go
+++ b/cmd/prompt.go
@@ -23,8 +23,8 @@ func promptAction(ctx *cli.Context) error {
 	fmt.Print("rancher cli auto-completion mode")
 	defer fmt.Println("Goodbye!")
 	p := prompt.New(
-		rancherPrompt.Executor,
-		rancherPrompt.Completer,
+		rancherprompt.Executor,
+		rancherprompt.Completer,
 		prompt.OptionTitle("rancher-prompt: interactive rancher client"),
 		prompt.OptionPrefix("rancher$ "),
 		prompt.OptionInputTextColor(prompt.Yellow),
diff --git a/main.go b/main.go
index 9ca92ea8..15629cf2 100644
--- a/main.go
+++ b/main.go
@@ -77,10 +77,10 @@ func mainErr() error {
 		cmd.SSHCommand(),
 	}
 	for _, com := range app.Commands {
-		rancherPrompt.Commands[com.Name] = com
-		rancherPrompt.Commands[com.ShortName] = com
+		rancherprompt.Commands[com.Name] = com
+		rancherprompt.Commands[com.ShortName] = com
 	}
-	rancherPrompt.Flags = app.Flags
+	rancherprompt.Flags = app.Flags
 	parsed, err := parseArgs(os.Args)
 	if err != nil {
 		logrus.Error(err)
diff --git a/package/Dockerfile b/package/Dockerfile
index f69edffb..d11097cc 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.7
 RUN apk add --no-cache ca-certificates openssh-client
 COPY rancher /usr/bin/
 WORKDIR /mnt
diff --git a/rancher_prompt/client.go b/rancher_prompt/client.go
index 7bf5afab..3bc29ea4 100644
--- a/rancher_prompt/client.go
+++ b/rancher_prompt/client.go
@@ -1 +1 @@
-package rancherPrompt
+package rancherprompt
diff --git a/rancher_prompt/completer.go b/rancher_prompt/completer.go
index 3346d40e..addeecdf 100644
--- a/rancher_prompt/completer.go
+++ b/rancher_prompt/completer.go
@@ -1,4 +1,4 @@
-package rancherPrompt
+package rancherprompt
 
 import (
 	"strings"
diff --git a/rancher_prompt/executor.go b/rancher_prompt/executor.go
index 57b68220..f53275ad 100644
--- a/rancher_prompt/executor.go
+++ b/rancher_prompt/executor.go
@@ -1,4 +1,4 @@
-package rancherPrompt
+package rancherprompt
 
 import (
 	"fmt"
diff --git a/rancher_prompt/options.go b/rancher_prompt/options.go
index 8c81c1a2..fa0ce13f 100644
--- a/rancher_prompt/options.go
+++ b/rancher_prompt/options.go
@@ -1,4 +1,4 @@
-package rancherPrompt
+package rancherprompt
 
 import (
 	"strings"
diff --git a/scripts/build b/scripts/build
index fdef434d..d488553d 100755
--- a/scripts/build
+++ b/scripts/build
@@ -6,7 +6,7 @@ cd $(dirname $0)/..
 
 declare -A OS_ARCH_ARG
 
-OS_PLATFORM_ARG=(linux darwin)
+OS_PLATFORM_ARG=(linux windows darwin)
 OS_ARCH_ARG[linux]="amd64 arm"
 OS_ARCH_ARG[windows]="386 amd64"
 OS_ARCH_ARG[darwin]="amd64"