diff --git a/setup/installers.py b/setup/installers.py
index 0448f577e3..c65f18a5d6 100644
--- a/setup/installers.py
+++ b/setup/installers.py
@@ -223,7 +223,8 @@ class ExportPackages(Command):
     def run(self, opts):
         base, bypy = get_paths()
         exe = get_exe()
-        cmd = [exe, bypy, 'export'] + list(opts.cli_args) + ['download.calibre-ebook.com:/srv/download/ci/calibre3']
+        for which in ('linux', 'macos', 'windows'):
+            cmd = [exe, bypy, 'export'] + ['download.calibre-ebook.com:/srv/download/ci/calibre6'] + [which]
         ret = subprocess.Popen(cmd).wait()
         if ret != 0:
             raise SystemExit(ret)
diff --git a/setup/unix-ci.py b/setup/unix-ci.py
index 5d7f8bc604..1d5e3bd4d0 100644
--- a/setup/unix-ci.py
+++ b/setup/unix-ci.py
@@ -139,7 +139,7 @@ def main():
 
         tball = 'macos-64' if ismacos else 'linux-64'
         download_and_decompress(
-            f'https://download.calibre-ebook.com/ci/calibre3/{tball}.tar.xz', SW
+            f'https://download.calibre-ebook.com/ci/calibre6/{tball}.tar.xz', SW
         )
         if not ismacos:
             install_linux_deps()
diff --git a/setup/win-ci.py b/setup/win-ci.py
index 15557ae36e..b51a3f7199 100644
--- a/setup/win-ci.py
+++ b/setup/win-ci.py
@@ -33,7 +33,7 @@ def download_file(url):
 def sw():
     sw = os.environ['SW']
     os.chdir(sw)
-    url = 'https://download.calibre-ebook.com/ci/calibre3/windows-64.tar.xz'
+    url = 'https://download.calibre-ebook.com/ci/calibre6/windows-64.tar.xz'
     tarball = download_file(url)
     with tarfile.open(fileobj=io.BytesIO(tarball)) as tf:
         tf.extractall()