diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index 80d6a6fdb..e78b9a634 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge AS mirror
+FROM alpine:3.6 AS mirror
 
 # update base image
 RUN apk update && apk upgrade -a
@@ -33,7 +33,7 @@ RUN go get -u github.com/golang/lint/golint
 RUN go get -u github.com/gordonklaus/ineffassign
 RUN go get -u github.com/LK4D4/vndr
 
-FROM alpine:edge
+FROM alpine:3.6
 
 COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
 COPY --from=mirror /etc/apk/keys /etc/apk/keys/
diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile
index d62bb98a2..66871dea6 100644
--- a/tools/alpine/Makefile
+++ b/tools/alpine/Makefile
@@ -2,7 +2,7 @@
 
 ORG?=linuxkit
 IMAGE=alpine
-BASE=alpine:edge
+BASE=alpine:3.6
 
 default: push
 
diff --git a/tools/alpine/versions b/tools/alpine/versions
index 89ce73193..eea74d9a1 100644
--- a/tools/alpine/versions
+++ b/tools/alpine/versions
@@ -108,7 +108,7 @@ libseccomp-dev-2.3.2-r0
 libsmartcols-2.28.2-r2
 libssh2-1.8.0-r1
 libstdc++-6.3.0-r4
-libtasn1-4.10-r0
+libtasn1-4.10-r1
 libtirpc-1.0.1-r1
 libunistring-0.9.7-r0
 libusb-1.0.21-r0