diff --git a/Makefile b/Makefile
index d2bbfef..50057a9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 # 6) Continue developing
 # 7) `make snapshot' as needed to push snapshot images to dockerhub
 #
-VERSION := 1-SNAPSHOT
+VERSION := 12-SNAPSHOT
 RELEASE_TYPE := $(if $(filter %-SNAPSHOT, $(VERSION)),snapshot,release)
 
 LABEL := com.teradata.git.hash=$(shell git rev-parse HEAD)
diff --git a/prestodb/hive3.1-hive/Dockerfile b/prestodb/hive3.1-hive/Dockerfile
index 72c2684..71994ec 100644
--- a/prestodb/hive3.1-hive/Dockerfile
+++ b/prestodb/hive3.1-hive/Dockerfile
@@ -26,13 +26,12 @@ ARG HADOOP_VERSION=3.1.2
 ARG HIVE_VERSION=3.1.2
 
 # TODO Apache Archive is rate limited -- these should probably go in S3
-ARG HADOOP_BINARY_PATH=https://archive.apache.org/dist/hadoop/common/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz
-ARG HIVE_BINARY_PATH=https://apache.mivzakim.net/hive/hive-$HIVE_VERSION/apache-hive-$HIVE_VERSION-bin.tar.gz
-
-RUN curl -o /tmp/hadoop.tar.gz --url $HADOOP_BINARY_PATH && \
+RUN HADOOP_BINARY_PATH=https://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}.tar.gz && \
+    curl -o /tmp/hadoop.tar.gz --url $HADOOP_BINARY_PATH && \
     tar xzf /tmp/hadoop.tar.gz --directory /opt && mv /opt/hadoop-$HADOOP_VERSION /opt/hadoop
 
-RUN curl -o /tmp/hive.tar.gz --url $HIVE_BINARY_PATH && \
+RUN HIVE_BINARY_PATH=https://archive.apache.org/dist/hive/hive-${HIVE_VERSION}/apache-hive-${HIVE_VERSION}-bin.tar.gz && \
+    curl -o /tmp/hive.tar.gz --url $HIVE_BINARY_PATH && \
     tar xzf /tmp/hive.tar.gz --directory /opt && mv /opt/apache-hive-${HIVE_VERSION}-bin /opt/hive
 
 ARG MYSQL_CONNECTOR_VERSION=8.0.13
diff --git a/prestodb/hive4.0-hive/Dockerfile b/prestodb/hive4.0-hive/Dockerfile
index 0914c55..355bfce 100644
--- a/prestodb/hive4.0-hive/Dockerfile
+++ b/prestodb/hive4.0-hive/Dockerfile
@@ -43,7 +43,7 @@ RUN yum install -y \
         curl -o /tmp/hadoop.tar.gz --url $HADOOP_BINARY_PATH && \
         tar xzf /tmp/hadoop.tar.gz --directory /opt && mv /opt/hadoop-${HADOOP_VERSION} /opt/hadoop && \
     # install hive
-    HIVE_BINARY_PATH=https://dlcdn.apache.org/hive/hive-$HIVE_VERSION/apache-hive-$HIVE_VERSION-bin.tar.gz && \
+    HIVE_BINARY_PATH=https://archive.apache.org/dist/hive/hive-$HIVE_VERSION/apache-hive-$HIVE_VERSION-bin.tar.gz && \
         curl -o /tmp/hive.tar.gz --url $HIVE_BINARY_PATH && \
         tar xzf /tmp/hive.tar.gz --directory /opt && mv /opt/apache-hive-${HIVE_VERSION}-bin /opt/hive && \
     # install mysql connector and aws s3 sdk