diff --git a/Dockerfile b/Dockerfile
index 4b0d3ed..01ecc50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,11 @@
-FROM golang:1.13
+FROM golang:1.13 as builder
 
-ADD . /workspace/cloudlog
-WORKDIR /workspace/cloudlog
+ADD . /app/
+WORKDIR /app/
 RUN make build
-ENTRYPOINT ["/workspace/cloudlog/cloudlog"]
+
+FROM alpine:latest
+RUN apk --no-cache add ca-certificates
+WORKDIR /root/
+COPY --from=builder /app/cloudlog /usr/local/bin/
+ENTRYPOINT ["cloudlog"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 257bef1..554a26f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ all: build
 
 # Build binary
 build:
-	go build $(LDFLAGS) 
+	CGO_ENABLED=0 go build $(LDFLAGS) 
 
 test:
 	go test -v ./...
\ No newline at end of file