diff --git a/group_vars/mirrors.yml b/group_vars/mirrors.yml
index c84de65bb9363af3e7ff709f93ff3cc66e48a227..c33327ab1d76b941a4d2a791e6d42fa6130a6172 100644
--- a/group_vars/mirrors.yml
+++ b/group_vars/mirrors.yml
@@ -1,5 +1,5 @@
 ---
-archweb_db_host: 'apollo.archlinux.org'
+archweb_db_host: 'archlinux.org'
 
 # raise tcp window limits to 32MiB
 tcp_rmem: "10240 87380 33554432"
diff --git a/playbooks/gemini.archlinux.org.yml b/playbooks/gemini.archlinux.org.yml
index aee44ac955e375e8ec432b9d532c7e21514d7e77..4c3375cd98a0bce627becfa1bf1ac101102e6879 100644
--- a/playbooks/gemini.archlinux.org.yml
+++ b/playbooks/gemini.archlinux.org.yml
@@ -4,7 +4,7 @@
   hosts: gemini.archlinux.org
   remote_user: root
   vars:
-    archweb_db_host: 'apollo.archlinux.org'
+    archweb_db_host: 'archlinux.org'
     dbscripts_commit: '20191022'
   roles:
     - { role: common }
diff --git a/playbooks/tasks/pacman-website.yml b/playbooks/tasks/pacman-website.yml
index 113a314940ca134e3051bd4b9d883ab912f1455e..7a9bc9b269793b95df49f006c8387d7e0fd342f0 100644
--- a/playbooks/tasks/pacman-website.yml
+++ b/playbooks/tasks/pacman-website.yml
@@ -29,5 +29,5 @@
 
       - name: upload website
         unarchive: src={{ tempdir.path }}/pacman/pacman-{{ pacman_version }}/doc/website.tar.gz dest={{ archweb_dir }}/archlinux.org/pacman mode=0644
-        delegate_to: apollo.archlinux.org
+        delegate_to: archlinux.org