diff --git a/playbooks/host_vars/static01.opendev.org.yaml b/playbooks/host_vars/static01.opendev.org.yaml
index 268e7ca24f..78ac2841d5 100644
--- a/playbooks/host_vars/static01.opendev.org.yaml
+++ b/playbooks/host_vars/static01.opendev.org.yaml
@@ -3,6 +3,8 @@ letsencrypt_certs:
   static01-opendev-org-main:
     - static.opendev.org
     - static01.opendev.org
+    - files.openstack.org
+    - static.openstack.org
   static01-developer-openstack-org:
     - developer.openstack.org
   static01-docs-opendev-org:
diff --git a/playbooks/roles/static/files/00-static.opendev.org.conf b/playbooks/roles/static/files/00-static.opendev.org.conf
index 4859396033..91bc6808ae 100755
--- a/playbooks/roles/static/files/00-static.opendev.org.conf
+++ b/playbooks/roles/static/files/00-static.opendev.org.conf
@@ -2,7 +2,7 @@ Define AFS_ROOT /afs/openstack.org/
 
 <VirtualHost *:80>
   ServerName static.opendev.org
-  ServerAlias static.openstack.org
+  ServerAlias static.openstack.org files.openstack.org
   RewriteEngine On
   RewriteRule ^/(.*) https://static.opendev.org/$1 [last,redirect=permanent]
   LogLevel warn
@@ -15,7 +15,7 @@ Define AFS_ROOT /afs/openstack.org/
 <VirtualHost *:443>
 
   ServerName static.opendev.org
-  ServerAlias static.openstack.org
+  ServerAlias static.openstack.org files.openstack.org
 
   DocumentRoot ${AFS_ROOT}
 
diff --git a/testinfra/test_static.py b/testinfra/test_static.py
index e4b896533f..0ff6122eb7 100644
--- a/testinfra/test_static.py
+++ b/testinfra/test_static.py
@@ -29,10 +29,17 @@ def test_zuul_user(host):
                                 user.home)
     assert authorized_keys.exists
 
-def test_static_opendev_org(host):
+static_names = (
+    'static.opendev.org',
+    'static.openstack.org',
+    'files.openstack.org',
+)
+
+@pytest.mark.parametrize("name", static_names)
+def test_static_opendev_org(host, name):
     cmd = host.run('curl --insecure '
-                   '--resolve static.opendev.org:443:127.0.0.1 '
-                   'https://static.opendev.org/')
+                   '--resolve %s:443:127.0.0.1 https://%s/' %
+                   (name, name))
     assert 'Index of /' in cmd.stdout
 
 def test_governance_openstack_org(host):
@@ -116,7 +123,7 @@ zuul_names = (
 )
 
 @pytest.mark.parametrize("name", zuul_names)
-def test_docs_openstack_org(host, name):
+def test_zuulci_org(host, name):
 
     cmd = host.run('curl --insecure '
                    '--resolve %s:443:127.0.0.1 https://%s/ ' %