diff --git a/stade/core/templates/data/2016.html b/stade/core/templates/data/2016.html
index e2f13c4..00aa80e 100644
--- a/stade/core/templates/data/2016.html
+++ b/stade/core/templates/data/2016.html
@@ -13,7 +13,7 @@
         <tr>
             <th>1</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part1_Training_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part1_Training_Data.zip">
                     Download (602MB)
                 </a>
                 <br>
@@ -21,21 +21,21 @@
             </td>
             <td>
                 <a
-                    href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part1_Training_GroundTruth.zip">
+                    href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part1_Training_GroundTruth.zip">
                     Download (6MB)
                 </a>
                 <br>
                 900 binary mask images in PNG format.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part1_Test_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part1_Test_Data.zip">
                     Download (232MB)
                 </a>
                 <br>
                 379 images of the exact same format as the Training Data.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part1_Test_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part1_Test_GroundTruth.zip">
                     Download (2MB)
                 </a>
                 <br>
@@ -49,7 +49,7 @@
         <tr>
             <th>2</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2_Training_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2_Training_Data.zip">
                     Download (671MB)
                 </a>
                 <br>
@@ -58,14 +58,14 @@
             </td>
             <td>
                 <a
-                    href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2_Training_GroundTruth.zip">
+                    href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2_Training_GroundTruth.zip">
                     Download (5MB)
                 </a>
                 <br>
                 807 dermoscopic feature files in JSON format.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2_Test_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2_Test_Data.zip">
                     Download (257MB)
                 </a>
                 <br>
@@ -73,7 +73,7 @@
                 Training Data.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2_Test_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2_Test_GroundTruth.zip">
                     Download (2MB)
                 </a>
                 <br>
@@ -82,7 +82,7 @@
         <tr>
             <th>2B</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2B_Training_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2B_Training_Data.zip">
                     Download (565MB)
                 </a>
                 <br>
@@ -90,21 +90,21 @@
             </td>
             <td>
                 <a
-                    href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2B_Training_GroundTruth.zip">
+                    href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2B_Training_GroundTruth.zip">
                     Download (5MB)
                 </a>
                 <br>
                 1614 binary mask images in PNG format.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2B_Test_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2B_Test_Data.zip">
                     Download (216MB)
                 </a>
                 <br>
                 335 lesion images of the exact same formats as the Training Data.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2B_Test_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2B_Test_GroundTruth.zip">
                     Download (2MB)
                 </a>
                 <br>
@@ -113,7 +113,7 @@
         <tr>
             <th>3</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3_Training_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3_Training_Data.zip">
                     Download (602MB)
                 </a>
                 <br>
@@ -121,21 +121,21 @@
             </td>
             <td>
                 <a
-                    href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3_Training_GroundTruth.csv">
+                    href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3_Training_GroundTruth.csv">
                     Download (19KB)
                 </a>
                 <br>
                 900 entries of gold standard malignant status.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3_Test_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3_Test_Data.zip">
                     Download (232MB)
                 </a>
                 <br>
                 379 images of the exact same format as the Training Data.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3_Test_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3_Test_GroundTruth.csv">
                     Download (7KB)
                 </a>
                 <br>
@@ -144,7 +144,7 @@
         <tr>
             <th>3B</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3B_Training_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3B_Training_Data.zip">
                     Download (608MB)
                 </a>
                 <br>
@@ -153,14 +153,14 @@
             </td>
             <td>
                 <a
-                    href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3B_Training_GroundTruth.csv">
+                    href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3B_Training_GroundTruth.csv">
                     Download (19KB)
                 </a>
                 <br>
                 900 entries of gold standard malignant status.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3B_Test_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3B_Test_Data.zip">
                     Download (234MB)
                 </a>
                 <br>
@@ -168,7 +168,7 @@
                 Training Data.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3B_Test_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3B_Test_GroundTruth.csv">
                     Download (7KB)
                 </a>
                 <br>
diff --git a/stade/core/templates/data/2017.html b/stade/core/templates/data/2017.html
index 3ccbb9f..2851c71 100644
--- a/stade/core/templates/data/2017.html
+++ b/stade/core/templates/data/2017.html
@@ -15,7 +15,7 @@
         <tr>
             <th>1</th>
             <td rowspan="3">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Training_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Training_Data.zip">
                     Download (5.8GB)
                 </a>
                 <br>
@@ -23,29 +23,29 @@
                 format, with EXIF data stripped.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Training_Part1_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Training_Part1_GroundTruth.zip">
                     Download (9MB)
                 </a>
                 <br>
                 2000 binary mask images in PNG format.
             </td>
             <td rowspan="3">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Validation_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Validation_Data.zip">
                     Download (878MB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Validation_Part1_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Validation_Part1_GroundTruth.zip">
                     Download (559KB)
                 </a>
             </td>
             <td rowspan="3">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Test_v2_Data.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Test_v2_Data.zip">
                     Download (5.4GB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Test_v2_Part1_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Test_v2_Part1_GroundTruth.zip">
                     Download (18MB)
                 </a>
             </td>
@@ -58,19 +58,19 @@
         <tr>
             <th>2</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Training_Part2_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Training_Part2_GroundTruth.zip">
                     Download (710KB)
                 </a>
                 <br>
                 2000 dermoscopic feature files in JSON format.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Validation_Part2_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Validation_Part2_GroundTruth.zip">
                     Download (51KB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Test_v2_Part2_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Test_v2_Part2_GroundTruth.zip">
                     Download (210KB)
                 </a>
                 <br>
@@ -79,19 +79,19 @@
         <tr>
             <th>3</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Training_Part3_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Training_Part3_GroundTruth.csv">
                     Download (43KB)
                 </a>
                 <br>
                 2000 entries of gold standard lesion diagnoses.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Validation_Part3_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Validation_Part3_GroundTruth.csv">
                     Download (3KB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2017/ISIC-2017_Test_v2_Part3_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2017/ISIC-2017_Test_v2_Part3_GroundTruth.csv">
                     Download (13KB)
                 </a>
                 <br>
diff --git a/stade/core/templates/data/2018.html b/stade/core/templates/data/2018.html
index 4e59607..3874def 100644
--- a/stade/core/templates/data/2018.html
+++ b/stade/core/templates/data/2018.html
@@ -17,37 +17,37 @@
         <tr>
             <th>1</th>
             <td rowspan="2">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task1-2_Training_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task1-2_Training_Input.zip">
                     Download (10.4GB)
                 </a>
                 <br>
                 2594 images and 12970 corresponding ground truth response masks (5 for each image).
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task1_Training_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task1_Training_GroundTruth.zip">
                     Download (26MB)
                 </a>
                 <br>
             </td>
             <td rowspan="2">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task1-2_Validation_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task1-2_Validation_Input.zip">
                     Download (228MB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task1_Validation_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task1_Validation_GroundTruth.zip">
                     Download (742KB)
                 </a>
             </td>
             <td rowspan="2">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task1-2_Test_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task1-2_Test_Input.zip">
                     Download (2.2GB)
                 </a>
                 <br>
                 1000 images.
             </td>
             <td>
-              <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task1_Test_GroundTruth.zip">
+              <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task1_Test_GroundTruth.zip">
                     Download (9MB)
                 </a>
             </td>
@@ -60,18 +60,18 @@
         <tr>
             <th>2</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task2_Training_GroundTruth_v3.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task2_Training_GroundTruth_v3.zip">
                     Download (33MB)
                 </a>
                 <br>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task2_Validation_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task2_Validation_GroundTruth.zip">
                     Download (1MB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task2_Test_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task2_Test_GroundTruth.zip">
                     Download (11MB)
                 </a>
             </td>
@@ -80,7 +80,7 @@
             <th>3</th>
             <td>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Training_Input.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Training_Input.zip">
                         Download (2.6GB)
                     </a>
                     <br>
@@ -89,7 +89,7 @@
                 </p>
                 <p>
                     <a
-                        href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Training_LesionGroupings.csv">
+                        href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Training_LesionGroupings.csv">
                         Download (481KB)
                     </a>
                     <br>
@@ -99,29 +99,29 @@
                 </p>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Training_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Training_GroundTruth.zip">
                     Download (36KB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Validation_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Validation_Input.zip">
                     Download (51MB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Validation_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Validation_GroundTruth.zip">
                     Download (7KB)
                 </a>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Test_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Test_Input.zip">
                     Download (401MB)
                 </a>
                 <br>
                 1512 images.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2018/ISIC2018_Task3_Test_GroundTruth.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2018/ISIC2018_Task3_Test_GroundTruth.zip">
                     Download (11KB)
                 </a>
             </td>
diff --git a/stade/core/templates/data/2019.html b/stade/core/templates/data/2019.html
index 5472283..851f1d9 100644
--- a/stade/core/templates/data/2019.html
+++ b/stade/core/templates/data/2019.html
@@ -13,28 +13,28 @@
         <tr>
             <th>1</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2019/ISIC_2019_Training_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2019/ISIC_2019_Training_Input.zip">
                     Download (9.1GB)
                 </a>
                 <br>
                 25,331 JPEG images of skin lesions.
             </td>
             <td rowspan="2">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2019/ISIC_2019_Training_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2019/ISIC_2019_Training_GroundTruth.csv">
                     Download (1MB)
                 </a>
                 <br>
                 25,331 entries of gold standard lesion diagnoses.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2019/ISIC_2019_Test_Input.zip">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2019/ISIC_2019_Test_Input.zip">
                     Download (3.6GB)
                 </a>
                 <br>
                 8,238 JPEG images of skin lesions.
             </td>
             <td rowspan="2">
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2019/ISIC_2019_Test_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2019/ISIC_2019_Test_GroundTruth.csv">
                     Download (454KB)
                 </a>
                 <br>
@@ -49,14 +49,14 @@
         <tr>
             <th>2</th>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2019/ISIC_2019_Training_Metadata.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2019/ISIC_2019_Training_Metadata.csv">
                     Download (1MB)
                 </a>
                 <br>
                 25,331 metadata entries of age, sex, general anatomic site, and common lesion identifier.
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2019/ISIC_2019_Test_Metadata.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2019/ISIC_2019_Test_Metadata.csv">
                     Download (287KB)
                 </a>
                 <br>
diff --git a/stade/core/templates/data/2020.html b/stade/core/templates/data/2020.html
index 41a1be6..a86286c 100644
--- a/stade/core/templates/data/2020.html
+++ b/stade/core/templates/data/2020.html
@@ -12,14 +12,14 @@
         <tr>
             <td>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Training_Dicom.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Training_Dicom.zip">
                         Download DICOM (48.9GB)
                     </a>
                     <br>
                     33,126 DICOM images with embedded metadata.
                 </p>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Train_DICOM_corrected.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Train_DICOM_corrected.zip">
                         Download DICOM Corrected* (23.0GB)
                     </a>
                     <br>
@@ -27,28 +27,28 @@
                 </p>
                 <hr>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Training_JPEG.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Training_JPEG.zip">
                         Download JPEG (23GB)
                     </a>
                     <br>
                     33,126 JPEG images.
                 </p>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Training_GroundTruth.csv">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Training_GroundTruth.csv">
                         Download metadata (2MB)
                     </a>
                     <br>
                     33,126 metadata entries of patient ID, sex, age, and general anatomic site.
                 </p>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Training_GroundTruth_v2.csv">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Training_GroundTruth_v2.csv">
                         Download metadata v2 (2MB)
                     </a>
                     <br>
                     33,126 metadata entries of patient ID, lesion ID, sex, age, and general anatomic site.
                 </p>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Training_Duplicates.csv">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Training_Duplicates.csv">
                         Download duplicate image list (2MB)
                     </a>
                     <br>
@@ -56,7 +56,7 @@
                 </p>
             </td>
             <td>
-                <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Training_GroundTruth.csv">
+                <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Training_GroundTruth.csv">
                     Download (2MB)
                 </a>
                 <br>
@@ -64,14 +64,14 @@
             </td>
             <td>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Test_Dicom.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Test_Dicom.zip">
                         Download DICOM (15.3GB)
                     </a>
                     <br>
                     10,982 DICOM images with embedded metadata.
                 </p>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Test_DICOM_corrected.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Test_DICOM_corrected.zip">
                         Download DICOM Corrected* (6.7GB)
                     </a>
                     <br>
@@ -79,14 +79,14 @@
                 </p>
                 <hr>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Test_JPEG.zip">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Test_JPEG.zip">
                         Download JPEG (6.7GB)
                     </a>
                     <br>
                     10,982 JPEG images.
                 </p>
                 <p>
-                    <a href="https://isic-challenge-data.s3.amazonaws.com/2020/ISIC_2020_Test_Metadata.csv">
+                    <a href="https://isic-archive.s3.amazonaws.com/challenges/2020/ISIC_2020_Test_Metadata.csv">
                         Download metadata (458KB)
                     </a>
                     <br>
diff --git a/stade/core/templates/data/milk10k.html b/stade/core/templates/data/milk10k.html
index 669df1d..321a651 100644
--- a/stade/core/templates/data/milk10k.html
+++ b/stade/core/templates/data/milk10k.html
@@ -12,28 +12,28 @@
     <tr>
       <td>
         <p>
-          <a href="https://isic-challenge-data.s3.amazonaws.com/milk10k/MILK10k_Training_Input.zip">
+          <a href="https://isic-archive.s3.amazonaws.com/challenges/milk10k/MILK10k_Training_Input.zip">
             Download (314MB)
           </a>
           <br>
           10,480 JPEG images, for 5,240 lesions.
         </p>
         <p>
-          <a href="https://isic-challenge-data.s3.amazonaws.com/milk10k/MILK10k_Training_Metadata.csv">
+          <a href="https://isic-archive.s3.amazonaws.com/challenges/milk10k/MILK10k_Training_Metadata.csv">
             Download (2MB)
           </a>
           <br>
           10,480 metadata entries, for 5,240 lesions.
         </p>
         <hr>
-        <a href="https://isic-challenge-data.s3.amazonaws.com/milk10k/MILK10k_Training_Supplement.csv">
+        <a href="https://isic-archive.s3.amazonaws.com/challenges/milk10k/MILK10k_Training_Supplement.csv">
           Download (549KB)
         </a>
         <br>
         10,480 supplemental metadata entries.
       </td>
       <td>
-        <a href="https://isic-challenge-data.s3.amazonaws.com/milk10k/MILK10k_Training_GroundTruth.csv">
+        <a href="https://isic-archive.s3.amazonaws.com/challenges/milk10k/MILK10k_Training_GroundTruth.csv">
           Download (287KB)
         </a>
         <br>
@@ -41,14 +41,14 @@
       </td>
       <td>
         <p>
-          <a href="https://isic-challenge-data.s3.amazonaws.com/milk10k/MILK10k_Test_Input.zip">
+          <a href="https://isic-archive.s3.amazonaws.com/challenges/milk10k/MILK10k_Test_Input.zip">
             Download (30MB)
           </a>
           <br>
           958 JPEG images, for 479 lesions.
         </p>
         <p>
-          <a href="https://isic-challenge-data.s3.amazonaws.com/milk10k/MILK10k_Test_Metadata.csv">
+          <a href="https://isic-archive.s3.amazonaws.com/challenges/milk10k/MILK10k_Test_Metadata.csv">
             Download (217KB)
           </a>
           <br>
diff --git a/stade/core/templates/landing/2016/37.html b/stade/core/templates/landing/2016/37.html
index 873d3cd..28d1236 100644
--- a/stade/core/templates/landing/2016/37.html
+++ b/stade/core/templates/landing/2016/37.html
@@ -19,7 +19,7 @@ <h2>Data</h2>
       <h4>Training Data</h4>
       <p>
         <strong>
-          <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part1_Training_Data.zip">
+          <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part1_Training_Data.zip">
             Download Training Data
           </a>
         </strong>
@@ -33,7 +33,7 @@ <h4>Training Data</h4>
       <h4>Training Ground Truth</h4>
       <p>
         <strong>
-          <a href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part1_Training_GroundTruth.zip">
+          <a href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part1_Training_GroundTruth.zip">
             Download Training Ground Truth
           </a>
         </strong>
diff --git a/stade/core/templates/landing/2016/38.html b/stade/core/templates/landing/2016/38.html
index 930d395..61086b1 100644
--- a/stade/core/templates/landing/2016/38.html
+++ b/stade/core/templates/landing/2016/38.html
@@ -61,7 +61,7 @@ <h4>Superpixel Overview</h4>
 </code></pre>
       <h4>Training Data</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2_Training_Data.zip">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2_Training_Data.zip">Download
         Training Data</a></strong></p>
       <p>The <strong>Training Data</strong> file is a ZIP file, containing 807 lesion images in JPEG
         format and 807 corresponding superpixel masks in PNG format. All lesion images are named
@@ -73,7 +73,7 @@ <h4>Training Data</h4>
         mask.</p>
       <h4>Training Ground Truth</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2_Training_GroundTruth.zip">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2_Training_GroundTruth.zip">Download
         Training Ground Truth</a></strong></p>
       <p>The <strong>Training Ground Truth</strong> file is a ZIP file, containing 807 dermoscopic
         feature files in <a href="http://www.json.org/">JSON format</a>. All feature files are named
diff --git a/stade/core/templates/landing/2016/39.html b/stade/core/templates/landing/2016/39.html
index 42cea92..e28e399 100644
--- a/stade/core/templates/landing/2016/39.html
+++ b/stade/core/templates/landing/2016/39.html
@@ -17,7 +17,7 @@ <h2>Data</h2>
         (definitive) malignancy diagnosis.</p>
       <h4>Training Data</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3_Training_Data.zip">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3_Training_Data.zip">Download
         Training Data</a></strong></p>
       <p>The <strong>Training Data</strong> file is a ZIP file, containing 900 dermoscopic lesion
         images in JPEG format. All images are named using the scheme
@@ -26,7 +26,7 @@ <h4>Training Data</h4>
         not be relied upon to provide accurate metadata.</p>
       <h4>Training Ground Truth</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3_Training_GroundTruth.csv">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3_Training_GroundTruth.csv">Download
         Training Ground Truth</a></strong></p>
       <p>The <strong>Training Ground Truth</strong> file is a single CSV (<a
           href="https://en.wikipedia.org/wiki/Comma-separated_values">comma-separated value</a>)
diff --git a/stade/core/templates/landing/2016/40.html b/stade/core/templates/landing/2016/40.html
index 9cb0367..c8632ed 100644
--- a/stade/core/templates/landing/2016/40.html
+++ b/stade/core/templates/landing/2016/40.html
@@ -22,7 +22,7 @@ <h2>Data</h2>
         segmentations of the location of the "globules" and "streaks" dermoscopic features.</p>
       <h4>Training Data</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2B_Training_Data.zip">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2B_Training_Data.zip">Download
         Training Data</a></strong></p>
       <p>The <strong>Training Data</strong> file is a ZIP file, containing 807 lesion images in JPEG
         format. All lesion images are named using the scheme <code>ISIC_&lt;image_id&gt;.jpg</code>,
@@ -31,7 +31,7 @@ <h4>Training Data</h4>
         accurate metadata.</p>
       <h4>Training Ground Truth</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part2B_Training_GroundTruth.zip">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part2B_Training_GroundTruth.zip">Download
         Training Ground Truth</a></strong></p>
       <p>The <strong>Training Ground Truth</strong> file is a ZIP file, containing 1614 binary mask
         images in PNG format. All masks are named using the scheme <code>ISIC_&lt;image_id&gt;_&lt;feature_name&gt;.png</code>,
diff --git a/stade/core/templates/landing/2016/41.html b/stade/core/templates/landing/2016/41.html
index c48bc6c..f49d47f 100644
--- a/stade/core/templates/landing/2016/41.html
+++ b/stade/core/templates/landing/2016/41.html
@@ -20,7 +20,7 @@ <h2>Data</h2>
         (definitive) malignancy diagnosis.</p>
       <h4>Training Data</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3B_Training_Data.zip">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3B_Training_Data.zip">Download
         Training Data</a></strong></p>
       <p>The <strong>Training Data</strong> file is a ZIP file, containing 900 dermoscopic lesion
         images in JPEG format and 900 associated segmentation binary masks in PNG format. All lesion
@@ -40,7 +40,7 @@ <h4>Training Data</h4>
       </ul>
       <h4>Training Ground Truth</h4>
       <p><strong><a
-          href="https://isic-challenge-data.s3.amazonaws.com/2016/ISBI2016_ISIC_Part3B_Training_GroundTruth.csv">Download
+          href="https://isic-archive.s3.amazonaws.com/challenges/2016/ISBI2016_ISIC_Part3B_Training_GroundTruth.csv">Download
         Training Ground Truth</a></strong></p>
       <p>The <strong>Training Ground Truth</strong> file is a single CSV (<a
           href="https://en.wikipedia.org/wiki/Comma-separated_values">comma-separated value</a>)