diff --git a/.zuul.yaml b/.zuul.yaml
index c32cceb8fb..8716397240 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -975,6 +975,7 @@
       - playbooks/bridge.yaml
       - playbooks/group_vars/gitea.yaml
       - playbooks/group_vars/gitea-lb.yaml
+      - playbooks/host_vars/gitea.*
       - playbooks/zuul/templates/group_vars/gitea.yaml.j2
       - playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2
       - playbooks/roles/gitea/
diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 92d02a26ab..a4cdf0e3ca 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -68,8 +68,7 @@ groups:
     - mirror[0-9]*.opendev.org
     - files[0-9]*.open*.org
     - static.openstack.org
-    - gitea01.opendev.org
-    - gitea99.opendev.org
+    - gitea[0-9]*.opendev.org
   logstash:
     - logstash[0-9]*.open*.org
   logstash-worker:
diff --git a/playbooks/host_vars/gitea02.opendev.org.yaml b/playbooks/host_vars/gitea02.opendev.org.yaml
new file mode 100644
index 0000000000..44cabb7ff9
--- /dev/null
+++ b/playbooks/host_vars/gitea02.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea02-main:
+    - gitea02.opendev.org
+    - opendev.org
diff --git a/playbooks/host_vars/gitea03.opendev.org.yaml b/playbooks/host_vars/gitea03.opendev.org.yaml
new file mode 100644
index 0000000000..02c58c7fdb
--- /dev/null
+++ b/playbooks/host_vars/gitea03.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea03-main:
+    - gitea03.opendev.org
+    - opendev.org
diff --git a/playbooks/host_vars/gitea04.opendev.org.yaml b/playbooks/host_vars/gitea04.opendev.org.yaml
new file mode 100644
index 0000000000..4a9ad0e17b
--- /dev/null
+++ b/playbooks/host_vars/gitea04.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea04-main:
+    - gitea04.opendev.org
+    - opendev.org
diff --git a/playbooks/host_vars/gitea05.opendev.org.yaml b/playbooks/host_vars/gitea05.opendev.org.yaml
new file mode 100644
index 0000000000..20920feb71
--- /dev/null
+++ b/playbooks/host_vars/gitea05.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea05-main:
+    - gitea05.opendev.org
+    - opendev.org
diff --git a/playbooks/host_vars/gitea06.opendev.org.yaml b/playbooks/host_vars/gitea06.opendev.org.yaml
new file mode 100644
index 0000000000..8634b9283a
--- /dev/null
+++ b/playbooks/host_vars/gitea06.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea06-main:
+    - gitea06.opendev.org
+    - opendev.org
diff --git a/playbooks/host_vars/gitea07.opendev.org.yaml b/playbooks/host_vars/gitea07.opendev.org.yaml
new file mode 100644
index 0000000000..59e3e56d15
--- /dev/null
+++ b/playbooks/host_vars/gitea07.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea07-main:
+    - gitea07.opendev.org
+    - opendev.org
diff --git a/playbooks/host_vars/gitea08.opendev.org.yaml b/playbooks/host_vars/gitea08.opendev.org.yaml
new file mode 100644
index 0000000000..6105091315
--- /dev/null
+++ b/playbooks/host_vars/gitea08.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+  gitea08-main:
+    - gitea08.opendev.org
+    - opendev.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 56fafe0278..7fff5af170 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -66,3 +66,24 @@
 # This allows us to do a rolling restart of the gitea backends.
 - name: letsencrypt updated gitea01-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea02-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea03-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea04-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea05-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea06-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea07-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
+
+- name: letsencrypt updated gitea08-main
+  include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml