diff --git a/framework/pom.xml b/framework/pom.xml
index f430ab4fb..018766ab0 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -256,7 +256,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>http://apache-drill.s3.amazonaws.com/files/tpcds_hivegenerated_parquet.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/tpcds_hivegenerated_parquet.tgz</url>
                   <outputFileName>tpcds_hivegenerated_parquet.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources</outputDirectory>
@@ -270,7 +270,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>http://apache-drill.s3.amazonaws.com/files/tpcds1_hive1dot2_withdate.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/tpcds1_hive1dot2_withdate.tgz</url>
                   <outputFileName>tpcds1_hive1dot2_withdate.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources</outputDirectory>
@@ -283,7 +283,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>http://apache-drill.s3.amazonaws.com/files/complexga100k.json.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/complexga100k.json.tgz</url>
                   <outputFileName>complexga100k.json.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/complex/json</outputDirectory>
@@ -296,7 +296,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>http://apache-drill.s3.amazonaws.com/files/complex.json.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/complex.json.tgz</url>
                   <outputFileName>complex.json.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/complex/json</outputDirectory>
@@ -309,7 +309,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>http://apache-drill.s3.amazonaws.com/files/mondrian_parquet.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/mondrian_parquet.tgz</url>
                   <outputFileName>mondrian_parquet.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/mondrian</outputDirectory>
@@ -322,7 +322,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/schema_change_empty_batch.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/schema_change_empty_batch.tgz</url>
                   <outputFileName>schema_change_empty_batch.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/schema_change_empty_batch/</outputDirectory>
@@ -335,7 +335,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/func-passing-widestrings-large.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/func-passing-widestrings-large.tgz</url>
                   <outputFileName>func-passing-widestrings-large.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>
@@ -350,7 +350,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/flatten-operators-100000rows.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/flatten-operators-100000rows.tgz</url>
                   <outputFileName>flatten-operators-100000rows.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/flatten_operators/</outputDirectory>
@@ -363,7 +363,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/func-passing-flatten-operators-large.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/func-passing-flatten-operators-large.tgz</url>
                   <outputFileName>func-passing-flatten-operators-large.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Functional/flatten_operators/100000rows/
@@ -377,7 +377,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3-us-west-1.amazonaws.com/drill-public/tpch/sf1/tpch_sf1_parquet.tar.gz</url>
+                  <url>https://s3-us-west-1.amazonaws.com/apache-drill-s3/tpch/sf1/tpch_sf1_parquet.tar.gz</url>
                   <outputFileName>tpch_sf1_parquet.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpch/sf1/parquet</outputDirectory>
@@ -390,7 +390,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3-us-west-1.amazonaws.com/drill-public/tpch/sf1/tpch_sf1_json.tar.gz</url>
+                  <url>https://s3-us-west-1.amazonaws.com/apache-drill-s3/tpch/sf1/tpch_sf1_json.tar.gz</url>
                   <outputFileName>tpch_sf1_json.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpch/sf1/json</outputDirectory>
@@ -403,7 +403,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3-us-west-1.amazonaws.com/drill-public/tpch/sf1/tpch_sf1_text.tar.gz</url>
+                  <url>https://s3-us-west-1.amazonaws.com/apache-drill-s3/tpch/sf1/tpch_sf1_text.tar.gz</url>
                   <outputFileName>tpch_sf1_text.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpch/sf1/text</outputDirectory>
@@ -416,7 +416,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3-us-west-1.amazonaws.com/drill-public/tpch/sf1/tpch_sf1_maprdb_json.tar.gz</url>
+                  <url>https://s3-us-west-1.amazonaws.com/apache-drill-s3/tpch/sf1/tpch_sf1_maprdb_json.tar.gz</url>
                   <outputFileName>tpch_sf1_maprdb_json.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpch/sf1/maprdb/json</outputDirectory>
@@ -429,7 +429,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/tpcds/tpcds_sf1_parquet.tar.gz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/tpcds/tpcds_sf1_parquet.tar.gz</url>
                   <outputFileName>tpcds_sf1_parquet.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpcds/sf1/parquet</outputDirectory>
@@ -442,7 +442,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/tpcds/tpcds_sf1_json.tar.gz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/tpcds/tpcds_sf1_json.tar.gz</url>
                   <outputFileName>tpcds_sf1_json.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpcds/sf1/json</outputDirectory>
@@ -455,7 +455,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3.amazonaws.com/apache-drill/files/tpcds/tpcds_sf1_text.tar.gz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/tpcds/tpcds_sf1_text.tar.gz</url>
                   <outputFileName>tpcds_text_sf1.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpcds/sf1/text</outputDirectory>
@@ -468,7 +468,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://s3-us-west-1.amazonaws.com/drill-public/tpcds/sf1/tpcds_sf1_maprdb_json.tar.gz</url>
+                  <url>https://s3-us-west-1.amazonaws.com/apache-drill-s3/tpcds/sf1/tpcds_sf1_maprdb_json.tar.gz</url>
                   <outputFileName>tpcds_sf1_maprdb_json.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/tpcds/sf1/maprdb/json</outputDirectory>
@@ -481,7 +481,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>http://apache-drill.s3.amazonaws.com/files/md1119_parquet.tgz</url>
+                  <url>http://apache-drill-s3.s3.amazonaws.com/files/md1119_parquet.tgz</url>
                   <outputFileName>md1119_parquet.tgz</outputFileName>
                   <unpack>true</unpack>
                   <outputDirectory>${project.basedir}/resources/Datasources/hive_storage/</outputDirectory>