diff --git a/inventory/service/host_vars/eavesdrop01.opendev.org.yaml b/inventory/service/host_vars/eavesdrop01.opendev.org.yaml
index c9e65fbb5e..875d45aa7b 100644
--- a/inventory/service/host_vars/eavesdrop01.opendev.org.yaml
+++ b/inventory/service/host_vars/eavesdrop01.opendev.org.yaml
@@ -1,5 +1,6 @@
 letsencrypt_certs:
   eavesdrop01-opendev-org-main:
     - eavesdrop01.opendev.org
-  ptgbot-opendev-org-main:
-    - ptgbot.opendev.org
+  ptg-opendev-org-main:
+    - ptg.opendev.org
+    - ptg.openstack.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index e3b55b8b01..601ebfa2c4 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -252,7 +252,7 @@
 - name: letsencrypt updated translate01-openstack-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
-- name: letsencrypt updated ptgbot-opendev-org-main
+- name: letsencrypt updated ptg-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
 # We split out handlers for each gitea host as handlers should be run in order
diff --git a/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2 b/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2
index 2c27201166..f28a8f6be2 100644
--- a/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2
+++ b/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2
@@ -1,31 +1,31 @@
 <VirtualHost *:80>
-  ServerName ptgbot.opendev.org
+  ServerName ptg.opendev.org
   ServerAdmin infra-root@openstack.org
 
-  ErrorLog ${APACHE_LOG_DIR}/ptgbot-error.log
+  ErrorLog ${APACHE_LOG_DIR}/ptg-error.log
 
   LogLevel warn
 
-  CustomLog ${APACHE_LOG_DIR}/ptgbot-access.log combined
+  CustomLog ${APACHE_LOG_DIR}/ptg-access.log combined
 
-  Redirect / https://ptgbot.opendev.org/
+  Redirect / https://ptg.opendev.org/
 
 </VirtualHost>
 
 <VirtualHost *:443>
-  ServerName ptgbot.opendev.org
+  ServerName ptg.opendev.org
   ServerAdmin webmaster@openstack.org
 
-  RewriteCond %{HTTP_HOST} !^ptgbot\.opendev\.org [nocase]
-  RewriteRule ^/(.*) https://ptgbot.opendev.org/$1 [last,redirect=permanent]
+  RewriteCond %{HTTP_HOST} !^ptg\.opendev\.org [nocase]
+  RewriteRule ^/(.*) https://ptg.opendev.org/$1 [last,redirect=permanent]
 
   AllowEncodedSlashes On
 
-  ErrorLog ${APACHE_LOG_DIR}/ptgbot-ssl-error.log
+  ErrorLog ${APACHE_LOG_DIR}/ptg-ssl-error.log
 
   LogLevel warn
 
-  CustomLog ${APACHE_LOG_DIR}/ptgbot-ssl-access.log combined
+  CustomLog ${APACHE_LOG_DIR}/ptg-ssl-access.log combined
 
   SSLEngine on
   SSLProtocol All -SSLv2 -SSLv3
@@ -33,9 +33,9 @@
   SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP
   SSLHonorCipherOrder on
 
-  SSLCertificateFile /etc/letsencrypt-certs/ptgbot.opendev.org/ptgbot.opendev.org.cer
-  SSLCertificateKeyFile /etc/letsencrypt-certs/ptgbot.opendev.org/ptgbot.opendev.org.key
-  SSLCertificateChainFile /etc/letsencrypt-certs/ptgbot.opendev.org/ca.cer
+  SSLCertificateFile /etc/letsencrypt-certs/ptg.opendev.org/ptg.opendev.org.cer
+  SSLCertificateKeyFile /etc/letsencrypt-certs/ptg.opendev.org/ptg.opendev.org.key
+  SSLCertificateChainFile /etc/letsencrypt-certs/ptg.opendev.org/ca.cer
 
   ProxyPass  / http://localhost:8000/ retry=0
   ProxyPassReverse / http://localhost:8000/
diff --git a/testinfra/test_eavesdrop.py b/testinfra/test_eavesdrop.py
index 0439e9eee9..a3b019c9d6 100644
--- a/testinfra/test_eavesdrop.py
+++ b/testinfra/test_eavesdrop.py
@@ -48,6 +48,6 @@ def test_statusbot_running(host):
 
 def test_ptgbot(host):
     cmd = host.run('curl --insecure '
-                   '--resolve ptgbot.opendev.org:443:127.0.0.1 '
-                   'https://ptgbot.opendev.org/')
+                   '--resolve ptg.opendev.org:443:127.0.0.1 '
+                   'https://ptg.opendev.org/')
     assert 'Project Teams Gathering' in cmd.stdout