diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 73418f82825eee53cfae0609134dcd81e667072b..69e7695eb773bf4bedb3eafb997f323fda08fcf1 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -91,11 +91,10 @@ for version in "${versions[@]}"; do
 		variantAliases=( "${versionAliases[@]/%/-$variant}" )
 		variantAliases=( "${variantAliases[@]//latest-/}" )
 
-		# TODO Architectures once https://github.com/gliderlabs/docker-alpine/issues/304 is resolved
-
 		echo
 		cat <<-EOE
 			Tags: $(join ', ' "${variantAliases[@]}")
+			Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 			GitCommit: $commit
 			Directory: $version/$variant
 		EOE
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index df9ff81b0237644a4331200e43b3100e7cc7a02f..ff3e445951f5a0298d48cd117bcf8aa7263bacf4 100644
--- a/mainline/alpine-perl/Dockerfile
+++ b/mainline/alpine-perl/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.7
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index 5d855f16ed0453230fdeb5d099c86999ea8ed80c..cf12377bdd03deb8606dc896699f9ae6ad14e80b 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.7
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
index 2d7c51c64f078f288401d8d3b240d533c11780d2..46153dda11271450673f75d9efd2aac17f545b94 100644
--- a/stable/alpine-perl/Dockerfile
+++ b/stable/alpine-perl/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.7
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
index 75c868a414e6ad9755209f53a16a2c1f466141f7..85017ebb0b723e10d7465a46301b98768e95bc6c 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.7
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"