diff --git a/build/package/Dockerfile.build b/build/package/Dockerfile.build
index 70efd341..dd85fd57 100644
--- a/build/package/Dockerfile.build
+++ b/build/package/Dockerfile.build
@@ -1,18 +1,21 @@
-FROM golang:1.13.1-alpine
-MAINTAINER "Stakater Team"
-
-RUN apk update
+FROM golang:1.13.9-alpine
+LABEL maintainer "Stakater Team"
 
 RUN apk -v --update \
-    add git build-base && \
-    rm -rf /var/cache/apk/* && \
-    mkdir -p "$GOPATH/src/github.com/stakater/Reloader"
+    --no-cache \
+    add git build-base
 
-ADD . "$GOPATH/src/github.com/stakater/Reloader"
+WORKDIR "$GOPATH/src/github.com/stakater/Reloader"
 
-RUN cd "$GOPATH/src/github.com/stakater/Reloader" && \
-    go mod download && \
-    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a --installsuffix cgo --ldflags="-s" -o /Reloader
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+COPY . .
+
+ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
+
+RUN go build -a --installsuffix cgo --ldflags="-s" -o /Reloader
 
 COPY build/package/Dockerfile.run /
 
diff --git a/build/package/Dockerfile.run b/build/package/Dockerfile.run
index e9367e8a..cc51fd14 100644
--- a/build/package/Dockerfile.run
+++ b/build/package/Dockerfile.run
@@ -1,7 +1,7 @@
-FROM alpine:3.9
-MAINTAINER "Stakater Team"
+FROM alpine:3.11
+LABEL maintainer "Stakater Team"
 
-RUN apk add --update ca-certificates
+RUN apk add --update --no-cache ca-certificates
 
 COPY Reloader /bin/Reloader