diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 9114075dd7..516875bc38 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -185,6 +185,9 @@
 - name: letsencrypt updated mirror01-openafs-provider-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
+- name: letsencrypt updated mirror02-openafs-provider-opendev-org-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
+
 - name: letsencrypt updated gitea99-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
 
diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml
index 17b44e31b0..033c2c400c 100644
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@@ -71,6 +71,7 @@
         - host_vars/lists.openstack.org.yaml
         - host_vars/gitea99.opendev.org.yaml
         - host_vars/mirror01.openafs.provider.opendev.org.yaml
+        - host_vars/mirror02.openafs.provider.opendev.org.yaml
         - host_vars/mirror-update01.opendev.org.yaml
         - host_vars/backup-test01.opendev.org.yaml
         - host_vars/backup-test02.opendev.org.yaml
diff --git a/playbooks/zuul/templates/gate-groups.yaml.j2 b/playbooks/zuul/templates/gate-groups.yaml.j2
index 95b1ce6a5f..97079316a6 100644
--- a/playbooks/zuul/templates/gate-groups.yaml.j2
+++ b/playbooks/zuul/templates/gate-groups.yaml.j2
@@ -9,6 +9,7 @@ groups:
     - letsencrypt01.opendev.org
     - letsencrypt02.opendev.org
     - mirror01.openafs.provider.opendev.org
+    - mirror02.openafs.provider.opendev.org
 
   backup-server:
     - backup01.region.provider.opendev.org
diff --git a/playbooks/zuul/templates/host_vars/mirror02.openafs.provider.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/mirror02.openafs.provider.opendev.org.yaml.j2
new file mode 100644
index 0000000000..91953feb26
--- /dev/null
+++ b/playbooks/zuul/templates/host_vars/mirror02.openafs.provider.opendev.org.yaml.j2
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  mirror02-openafs-provider-opendev-org-main:
+    - mirror02.openafs.provider.opendev.org
+    - mirror.openafs.provider.opendev.org
diff --git a/testinfra/test_mirror.py b/testinfra/test_mirror.py
index 404733f1fa..e111a647cc 100644
--- a/testinfra/test_mirror.py
+++ b/testinfra/test_mirror.py
@@ -13,7 +13,8 @@
 # under the License.
 
 
-testinfra_hosts = ['mirror01.region.provider.opendev.org']
+testinfra_hosts = ['mirror01.region.provider.opendev.org',
+                   'mirror02.region.provider.opendev.org']
 
 
 def test_apache(host):
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 86874c2780..9dcc1e763a 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -367,6 +367,8 @@
           label: ubuntu-bionic
         - name: mirror01.openafs.provider.opendev.org
           label: ubuntu-bionic
+        - name: mirror02.openafs.provider.opendev.org
+          label: ubuntu-focal
 
 - job:
     name: system-config-run-mirror-arm64