diff --git a/.jenkins/scripts/download_and_install_anaconda.sh b/.jenkins/scripts/download_and_install_anaconda.sh
index 8c69f19be..ec4b61f67 100755
--- a/.jenkins/scripts/download_and_install_anaconda.sh
+++ b/.jenkins/scripts/download_and_install_anaconda.sh
@@ -33,12 +33,13 @@ fi
 echo ${PATH}
 which conda
 conda clean -i -t -y  # in case of corrupt package cache from previous run
-conda update --quiet conda
 # These 2 channels need removing if testing old branches has reinstated them:
 conda config --remove channels http://ssb.stsci.edu/astroconda || :
 conda config --remove channels http://astroconda.gemini.edu/public/noarch || :
+conda config --remove channels http://astroconda.gemini.edu/public || :
 conda config --add channels conda-forge
-conda config --add channels http://astroconda.gemini.edu/public
+conda config --add channels http://jastro.org/astroconda/public
 conda config --set channel_priority true
 conda config --set restore_free_channel false
+conda update --quiet conda
 conda env list
diff --git a/tox.ini b/tox.ini
index 0eea5d46f..fe275af77 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,7 +49,7 @@ conda_deps =
     specutils>=1.1
     sqlalchemy>=1.3,<2.0.0a0  # new v2 API breaks calmgr (installed as wheel)
 conda_channels =
-    http://astroconda.gemini.edu/public
+    http://jastro.org/astroconda/public
     conda-forge
 conda_create_args =
     --override-channels