diff --git a/0.11/Dockerfile b/0.11/Dockerfile
index a98ed4f..80b164e 100644
--- a/0.11/Dockerfile
+++ b/0.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:wheezy
+FROM debian:stretch
 LABEL authors="Adam Hawkins <hi@ahawkins.me>"
 
 ENV THRIFT_VERSION 0.11.0
@@ -31,7 +31,11 @@ RUN buildDeps=" \
 	&& make install \
 	&& cd / \
 	&& rm -rf /usr/src/thrift \
-	&& curl -k -sSL "https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz" -o go.tar.gz \
+	&& if [ $(uname -m) = "aarch64" ]; then \
+	curl -k -sSL "https://storage.googleapis.com/golang/go1.10.1.linux-arm64.tar.gz" -o go.tar.gz ; \
+	else \
+	curl -k -sSL "https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz" -o go.tar.gz ; \
+	fi \
 	&& tar xzf go.tar.gz \
 	&& rm go.tar.gz \
 	&& cp go/bin/gofmt /usr/bin/gofmt \