diff --git a/build.gradle b/build.gradle
index 9ec15bbf9..14b7e8ec9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,9 +87,8 @@ task updateDlsSubmodule(type: Exec) {
 
 compileThrift {
     dependsOn updateDlsSubmodule
+    verbose true
     sourceItems "${projectDir}/src/main/idls/thrift/cadence.thrift","${projectDir}/src/main/idls/thrift/shared.thrift","${projectDir}/src/main/idls/thrift/shadower.thrift"
-
-    nowarn true
 }
 
 compileJava {
diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile
index 44ec307ef..47445f15e 100644
--- a/docker/buildkite/Dockerfile
+++ b/docker/buildkite/Dockerfile
@@ -1,4 +1,7 @@
-FROM adoptopenjdk/openjdk11:alpine
+# Always use a release version or a specific commit hash below. Don't use
+# a branch name since we'd keep getting updates as long as there are new
+# commits to that branch and one of them can break the build
+FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine
 
 # Apache Thrift version
 ENV APACHE_THRIFT_VERSION=0.9.3
@@ -10,13 +13,15 @@ RUN apk add git libstdc++
 
 # Compile source
 RUN set -ex ;\
-	wget http://www-us.apache.org/dist/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
-	tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
-	rm thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
-	cd thrift-${APACHE_THRIFT_VERSION}/ ;\
-	./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no ;\
-	make -j2 && make install ;\
-	cd .. && rm -rf thrift-${APACHE_THRIFT_VERSION}
+	wget https://downloads.apache.org/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
+	tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
+	rm thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
+	cd thrift-${APACHE_THRIFT_VERSION}/ && \
+	./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no && \
+	make && \
+	make install && \
+	cd .. && \
+	rm -rf thrift-${APACHE_THRIFT_VERSION}
 
 # Cleanup packages and remove cache
 RUN apk del build-dependencies wget && rm -rf /var/cache/apk/*