diff --git a/.goreleaser.yml b/.goreleaser.yml
index 61aa356e5f6f0a39d8c21a81ca838a3c25d08cb9..7cb58225caaee1bd943a2f49f40a659ac1c5363c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -9,11 +9,6 @@ builds:
 # Archive customization
 archive:
   format: tar.gz
-dockers:
-  -
-    binary: kube-bench
-    image: aquasec/kube-bench
-    latest: true
 fpm:
   vendor: Aqua Security
   description: "The Kubernetes Bench for Security is a Go application that checks whether Kubernetes is deployed according to security best practices"
diff --git a/Dockerfile b/Dockerfile
index 115f429026293d03d06086c351d722e93712ac91..10f16761ba75a39997c17372c1a3707496f20aca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ RUN go get github.com/aquasecurity/kube-bench
 FROM alpine:latest
 WORKDIR /
 COPY --from=0 /go/bin/kube-bench /kube-bench 
-COPY cfg cfg
-COPY entrypoint.sh /entrypoint.sh
+COPY --from=0 /go/src/github.com/aquasecurity/kube-bench/cfg /cfg
+COPY --from=0 /go/src/github.com/aquasecurity/kube-bench/entrypoint.sh /entrypoint.sh
 ENTRYPOINT /entrypoint.sh
 
 # Build-time metadata as defined at http://label-schema.org
diff --git a/cmd/common.go b/cmd/common.go
index bc4dbe292f27c1e5ffae20b41d4d8a2adc472bb9..15cb23781129170300f9413046a4647bda11e5a2 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -103,7 +103,7 @@ func runChecks(t check.NodeType) {
 		fmt.Println(string(out))
 	} else {
 		// if we want to store in PostgreSQL, convert to JSON and save it
-		if (summary.Fail > 0 || summary.Warn > 0 || summary.Pass > 0) && pgSql {
+		if (summary.Fail > 0 || summary.Warn > 0 || summary.Pass > 0) && pgSQL {
 			out, err := controls.JSON()
 			if err != nil {
 				exitWithError(fmt.Errorf("failed to output in JSON format: %v", err))
diff --git a/cmd/database.go b/cmd/database.go
index 46668ae2a8e598ae4d54cff2c951e52c513efa18..dbbbb94b8c11cefda065ce7fd78c413df4a61765 100644
--- a/cmd/database.go
+++ b/cmd/database.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/postgres"
+	_ "github.com/jinzhu/gorm/dialects/postgres" // database packages get blank imports
 	"github.com/spf13/viper"
 )
 
diff --git a/cmd/root.go b/cmd/root.go
index 3c80f5d5941170805098a0eafde266edd685ef00..76d871a5e54f22cb08523dd4cf95e68cb31311cd 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -30,7 +30,7 @@ var (
 	defaultKubeVersion = "1.6"
 	cfgFile            string
 	jsonFmt            bool
-	pgSql              bool
+	pgSQL              bool
 	checkList          string
 	groupList          string
 	masterFile         string
@@ -61,7 +61,7 @@ func init() {
 	cobra.OnInitialize(initConfig)
 
 	RootCmd.PersistentFlags().BoolVar(&jsonFmt, "json", false, "Prints the results as JSON")
-	RootCmd.PersistentFlags().BoolVar(&pgSql, "pgsql", false, "Save the results to PostgreSQL")
+	RootCmd.PersistentFlags().BoolVar(&pgSQL, "pgsql", false, "Save the results to PostgreSQL")
 	RootCmd.PersistentFlags().StringVarP(
 		&checkList,
 		"check",
diff --git a/cmd/util.go b/cmd/util.go
index 66ae5a726e206035589294d4401d628a51b517b0..4f0c6586f7502c02459d6e3df319cb5350d532ff 100644
--- a/cmd/util.go
+++ b/cmd/util.go
@@ -196,9 +196,8 @@ func findExecutable(candidates []string) (string, error) {
 	for _, c := range candidates {
 		if verifyBin(c) {
 			return c, nil
-		} else {
-			glog.V(1).Info(fmt.Sprintf("executable '%s' not running", c))
 		}
+		glog.V(1).Info(fmt.Sprintf("executable '%s' not running", c))
 	}
 
 	return "", fmt.Errorf("no candidates running")