diff --git a/Dockerfile b/Dockerfile
index 35766198..ba83fde7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge AS builder
+FROM alpine AS builder
 
 COPY . /go/src/github.com/42wim/matterbridge
 RUN apk update && apk add go git gcc musl-dev \
@@ -7,7 +7,7 @@ RUN apk update && apk add go git gcc musl-dev \
         && go get \
         && go build -x -ldflags "-X main.githash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge
 
-FROM alpine:edge
+FROM alpine
 RUN apk --no-cache add ca-certificates mailcap
 COPY --from=builder /bin/matterbridge /bin/matterbridge
 RUN mkdir /etc/matterbridge \
diff --git a/tgs.Dockerfile b/tgs.Dockerfile
index 0333f69b..06bbb341 100644
--- a/tgs.Dockerfile
+++ b/tgs.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge AS builder
+FROM alpine AS builder
 
 COPY . /go/src/github.com/42wim/matterbridge
 RUN apk add \
@@ -11,7 +11,7 @@ RUN apk add \
   && go get \
   && go build -x -ldflags "-X main.githash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge
 
-FROM alpine:edge
+FROM alpine
 RUN apk --no-cache add \
     ca-certificates \
     cairo \