diff --git a/Dockerfile b/Dockerfile
index 714e66b..3fe30d4 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,10 @@
+FROM golang:1.13.4-alpine as build
+RUN mkdir -p /go/src/github.com/aosapps/drone-sonar-plugin
+WORKDIR /go/src/github.com/aosapps/drone-sonar-plugin 
+COPY *.go ./
+COPY vendor ./vendor/
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o drone-sonar
+
 FROM openjdk:8-jre-alpine
 
 ARG SONAR_VERSION=3.3.0.1492
@@ -5,7 +12,7 @@ ARG SONAR_SCANNER_CLI=sonar-scanner-cli-${SONAR_VERSION}
 ARG SONAR_SCANNER=sonar-scanner-${SONAR_VERSION}
 
 RUN apk add --no-cache --update nodejs curl
-COPY drone-sonar /bin/
+COPY --from=build /go/src/github.com/aosapps/drone-sonar-plugin/drone-sonar /bin/
 WORKDIR /bin
 
 RUN curl https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/${SONAR_SCANNER_CLI}.zip -so /bin/${SONAR_SCANNER_CLI}.zip
diff --git a/drone-sonar b/drone-sonar
deleted file mode 100755
index 69cfba7..0000000
Binary files a/drone-sonar and /dev/null differ