diff --git a/Dockerfile b/Dockerfile
index 32687ff..469066f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,24 @@
-FROM golang:1.9.2-alpine3.6 AS golang-build
+FROM golang:1.11.0-alpine3.8 AS golang-build
+
 RUN mkdir -p /go/src/github.com/AirHelp/rabbit-amazon-forwarder
 WORKDIR /go/src/github.com/AirHelp/rabbit-amazon-forwarder
+
 RUN apk --no-cache add git && go get -u github.com/golang/dep/cmd/dep
+
 COPY Gopkg.toml Gopkg.lock ./
 RUN dep ensure -v -vendor-only
+
 COPY . .
+
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o rabbit-amazon-forwarder .
 
-FROM alpine:3.6
+FROM alpine:3.8
+
 RUN mkdir -p /config
 RUN apk --update upgrade && \
     apk add curl ca-certificates && \
     update-ca-certificates && \
     rm -rf /var/cache/apk/*
+
 COPY --from=golang-build /go/src/github.com/AirHelp/rabbit-amazon-forwarder/rabbit-amazon-forwarder /
 CMD ["/rabbit-amazon-forwarder"]
diff --git a/Dockerfile-test b/Dockerfile-test
index a489b26..1975945 100644
--- a/Dockerfile-test
+++ b/Dockerfile-test
@@ -1,7 +1,10 @@
-FROM golang:1.9.2-alpine3.6
+FROM golang:1.11.0-alpine3.8
+
 WORKDIR /go/src/github.com/AirHelp/rabbit-amazon-forwarder
-RUN apk --no-cache add git && go get -u github.com/golang/dep/cmd/dep
+
+RUN apk --no-cache add git gcc musl-dev && go get -u github.com/golang/dep/cmd/dep
+
 COPY Gopkg.toml Gopkg.lock ./
 RUN dep ensure -v -vendor-only
-COPY . .
 
+COPY . .