diff --git a/benchmarks/web-search/dataset/Dockerfile b/benchmarks/web-search/dataset/Dockerfile
index 2db979bdf..066b4e08f 100644
--- a/benchmarks/web-search/dataset/Dockerfile
+++ b/benchmarks/web-search/dataset/Dockerfile
@@ -5,7 +5,7 @@ RUN BUILD_DEPS="wget curl ca-certificates" \
     && apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/* 
 
-ENV INDEX_URL http://cloudsuite.ch/download/web_search/index_14GB.tar.gz
+ENV INDEX_URL http://datasets.epfl.ch/cloudsuite/index_14GB.tar.gz
 
 VOLUME ["/download"]
 
diff --git a/benchmarks/web-search/index/Dockerfile b/benchmarks/web-search/index/Dockerfile
index efa163e3c..a1a31cb38 100644
--- a/benchmarks/web-search/index/Dockerfile
+++ b/benchmarks/web-search/index/Dockerfile
@@ -9,7 +9,7 @@ ENV NUTCH_VERSION 1.18
 ENV NUTCH_HOME $BASE_PATH/apache-nutch-1.18
 ENV SOLR_VERSION 9.1.1
 ENV SOLR_HOME $BASE_PATH/solr-$SOLR_VERSION
-ENV PACKAGES_URL http://cloudsuite.ch/download/web_search
+ENV PACKAGES_URL http://datasets.epfl.ch/cloudsuite
 ENV INDEX_URL $PACKAGES_URL/index
 ENV SCHEMA_URL $PACKAGES_URL/schema.xml
 ENV SOLR_CONFIG_URL $PACKAGES_URL/solrconfig.xml
diff --git a/benchmarks/web-search/server/Dockerfile b/benchmarks/web-search/server/Dockerfile
index c04b8914a..1c2857113 100644
--- a/benchmarks/web-search/server/Dockerfile
+++ b/benchmarks/web-search/server/Dockerfile
@@ -10,7 +10,7 @@ RUN cat /root/limits.txt >> /etc/security/limits.conf
 ENV BASE_PATH /usr/src
 ENV SOLR_VERSION 9.1.1
 ENV SOLR_HOME $BASE_PATH/solr-$SOLR_VERSION
-ENV PACKAGES_URL http://cloudsuite.ch/download/web_search
+ENV PACKAGES_URL http://datasets.epfl.ch/cloudsuite
 ENV INDEX_URL $PACKAGES_URL/index
 ENV SCHEMA_URL $PACKAGES_URL/schema.xml
 ENV SOLR_CONFIG_URL $PACKAGES_URL/solrconfig.xml
diff --git a/benchmarks/web-serving/db_server/Dockerfile b/benchmarks/web-serving/db_server/Dockerfile
index 5b79b1b28..925a92d4f 100644
--- a/benchmarks/web-serving/db_server/Dockerfile
+++ b/benchmarks/web-serving/db_server/Dockerfile
@@ -1,7 +1,7 @@
 FROM cloudsuite/mysql:mariadb-10.6
 
 ENV root_password root
-ENV DB_URL http://cloudsuite.ch/download/web_serving/ELGG_DB.tar.gz
+ENV DB_URL http://datasets.epfl.ch/cloudsuite/ELGG_DB.tar.gz
 
 RUN apt-get update && apt-get install -y --no-install-recommends wget mariadb-backup \
   && rm -rf /var/lib/apt/lists/*
diff --git a/benchmarks/web-serving/db_server/entrypoint.sh b/benchmarks/web-serving/db_server/entrypoint.sh
index 858798172..5c5492811 100755
--- a/benchmarks/web-serving/db_server/entrypoint.sh
+++ b/benchmarks/web-serving/db_server/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-wget --progress=bar:force -O - --no-check-certificate https://cloudsuite.ch/download/web-serving/ELGG_DB.tar.gz | tar -zxvf -
+wget --progress=bar:force -O - --no-check-certificate http://datasets.epfl.ch/cloudsuite/ELGG_DB.tar.gz | tar -zxvf -
 
 
 # workaround for overlayfs:
diff --git a/benchmarks/web-serving/web_server/Dockerfile b/benchmarks/web-serving/web_server/Dockerfile
index 4550b2a4c..881d1d61b 100644
--- a/benchmarks/web-serving/web_server/Dockerfile
+++ b/benchmarks/web-serving/web_server/Dockerfile
@@ -27,7 +27,7 @@ RUN cat /tmp/limits.conf.append >> /etc/security/limits.conf && rm -f /tmp/limit
 
 # Checkout the Elgg installation
 RUN mkdir /usr/share/nginx/html/elgg && \ 
-    wget --progress=bar:force -O - http://cloudsuite.ch/download/web-serving/elgg_installation_4.3.0.tar.gz | \
+    wget --progress=bar:force -O - http://datasets.epfl.ch/cloudsuite/elgg_installation_4.3.0.tar.gz | \
     tar zxvf - -C ~ && \
     mv ~/elgg_installation_4.3.0/* /usr/share/nginx/html/elgg/.
    
diff --git a/datasets/twitter-dataset-graph/latest/Dockerfile b/datasets/twitter-dataset-graph/latest/Dockerfile
index 1a719e002..bd0bb64fb 100644
--- a/datasets/twitter-dataset-graph/latest/Dockerfile
+++ b/datasets/twitter-dataset-graph/latest/Dockerfile
@@ -5,7 +5,7 @@ RUN BUILD_DEPS="wget unzip" \
     && apt-get update && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /data \
-    && wget --no-check-certificate -O /data/Twitter-dataset.zip https://cloudsuite.ch/download/graph_analytics/twitter_dataset.zip \
+    && wget --no-check-certificate -O /data/Twitter-dataset.zip http://datasets.epfl.ch/cloudsuite/twitter_dataset.zip \
     && unzip -d /data /data/Twitter-dataset.zip \
     && rm /data/Twitter-dataset.zip \
     && apt-get purge -y --auto-remove ${BUILD_DEPS}