diff --git a/doc/source/etherpad.rst b/doc/source/etherpad.rst
index 38208d101d..0b776c144c 100644
--- a/doc/source/etherpad.rst
+++ b/doc/source/etherpad.rst
@@ -19,7 +19,7 @@ At a Glance
   * https://opendev.org/opendev/system-config
   * :git_file:`playbooks/roles/etherpad`
   * :git_file:`playbooks/service-etherpad.yaml`
-  * :git_file:`inventory/service/host_vars/etherpad01.opendev.org.yaml`
+  * :git_file:`inventory/service/group_vars/etherpad.yaml`
 :Projects:
   * https://etherpad.org/
   * https://github.com/ether/etherpad-lite
diff --git a/inventory/service/host_vars/etherpad01.opendev.org.yaml b/inventory/service/group_vars/etherpad.yaml
similarity index 83%
rename from inventory/service/host_vars/etherpad01.opendev.org.yaml
rename to inventory/service/group_vars/etherpad.yaml
index e3e4112a23..1b0f272cd4 100644
--- a/inventory/service/host_vars/etherpad01.opendev.org.yaml
+++ b/inventory/service/group_vars/etherpad.yaml
@@ -1,8 +1,8 @@
 etherpad_vhost_name: etherpad.opendev.org
 letsencrypt_certs:
-  etherpad01-opendev-org-main:
+  etherpad-opendev-org-main:
     - etherpad.opendev.org
-    - etherpad01.opendev.org
+    - '{{ inventory_hostname }}'
     - etherpad.openstack.org
 etherpad_redirect_vhost: etherpad.openstack.org
 borg_backup_excludes_extra:
diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index e835adf8ab..0d669f71b2 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -55,7 +55,7 @@ groups:
     - adns*.opendev.org
     - ns*.opendev.org
   eavesdrop: eavesdrop[0-9]*.opendev.org
-  etherpad: etherpad[0-9]*.open*.org
+  etherpad: etherpad[0-9]*.opendev.org
   gitea:
     - gitea[0-9]*.opendev.org
   gitea-lb:
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 816aeb36f8..6bbf6450f8 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -244,7 +244,7 @@
 - name: letsencrypt updated nb01-test-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
-- name: letsencrypt updated etherpad01-opendev-org-main
+- name: letsencrypt updated etherpad-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
 - name: letsencrypt updated keycloak01-opendev-org-main
diff --git a/playbooks/service-etherpad.yaml b/playbooks/service-etherpad.yaml
index 94cf0a7390..ba34cb608c 100644
--- a/playbooks/service-etherpad.yaml
+++ b/playbooks/service-etherpad.yaml
@@ -1,4 +1,4 @@
-- hosts: "etherpad01.opendev.org:!disabled"
+- hosts: "etherpad:!disabled"
   name: "Base: configure etherpad"
   roles:
     - iptables
diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml
index 808a3450bb..60687855a3 100644
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@@ -139,7 +139,7 @@
         - group_vars/zuul-scheduler.yaml
         - group_vars/zuul-web.yaml
         - host_vars/codesearch01.opendev.org.yaml
-        - host_vars/etherpad01.opendev.org.yaml
+        - host_vars/etherpad99.opendev.org.yaml
         - host_vars/letsencrypt01.opendev.org.yaml
         - host_vars/letsencrypt02.opendev.org.yaml
         - host_vars/lists.openstack.org.yaml
diff --git a/playbooks/zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/etherpad99.opendev.org.yaml.j2
similarity index 100%
rename from playbooks/zuul/templates/host_vars/etherpad01.opendev.org.yaml.j2
rename to playbooks/zuul/templates/host_vars/etherpad99.opendev.org.yaml.j2
diff --git a/testinfra/test_etherpad.py b/testinfra/test_etherpad.py
index 3cc0d25c0b..5f63d85f38 100644
--- a/testinfra/test_etherpad.py
+++ b/testinfra/test_etherpad.py
@@ -13,7 +13,7 @@
 # under the License.
 
 
-testinfra_hosts = ['etherpad01.opendev.org']
+testinfra_hosts = ['etherpad99.opendev.org']
 
 
 def test_etherpad_listening(host):
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 023d3eaf05..a3d12deb5f 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -188,8 +188,7 @@
     files:
       - inventory/base
       - playbooks/service-etherpad.yaml
-      - inventory/service/host_vars/etherpad01.opendev.org.yaml
-      - inventory/service/group_vars/etherpad
+      - inventory/service/group_vars/etherpad.yaml
       - playbooks/roles/install-docker/
       - playbooks/roles/pip3/
       - playbooks/roles/etherpad
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 4a8242097a..0c4cc4e01a 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -651,7 +651,7 @@
     nodeset:
       nodes:
         - <<: *bridge_node_x86
-        - name: etherpad01.opendev.org
+        - name: etherpad99.opendev.org
           label: ubuntu-bionic
       groups:
         - <<: *bastion_group