diff --git a/hiera/common.yaml b/hiera/common.yaml
index f85a13fae7..27f17396dc 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -324,6 +324,7 @@ cacti_hosts:
 - mirror-update.openstack.org
 - review-dev01.opendev.org
 - review.openstack.org
+- static01.opendev.org
 - status01.openstack.org
 - storyboard01.opendev.org
 - storyboard-dev01.opendev.org
diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 6235ef2482..8605dc8a7c 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -71,7 +71,6 @@ groups:
     - nb[0-9]*.opendev.org
     - review-dev[0-9]*.open*.org
     - review[0-9]*.open*.org
-    - static.openstack.org
     - static[0-9]*.opendev.org
     - zuul[0-9]*.open*.org
   logstash:
@@ -144,7 +143,6 @@ groups:
     - pbx[0-9]*.opendev.org
     - planet[0-9]*.open*.org
     - refstack*.open*.org
-    - static*.openstack.org
     - status*.open*.org
     - storyboard-dev[0-9]*.opendev.org
     - storyboard[0-9]*.opendev.org
@@ -190,7 +188,6 @@ groups:
     - pbx[0-9]*.opendev.org
     - planet[0-9]*.open*.org
     - refstack*.open*.org
-    - static*.openstack.org
     - status*.open*.org
     - storyboard[0-9]*.opendev.org
     - storyboard-dev[0-9]*.opendev.org
@@ -213,10 +210,6 @@ groups:
   review:
     - review[0-9]*.open*.org
   static:
-    - static*.openstack.org
-  # NOTE(ianw): 2019-12 : rename below when static.openstack.org is
-  # gone
-  static_opendev:
     - static[0-9]*.opendev.org
   status:
     - status*.open*.org
@@ -251,7 +244,7 @@ groups:
     - paste[0-9]*.open*.org
     - planet[0-9]*.open*.org
     - refstack*.open*.org
-    - static*.open*.org
+    - static[0-9]*.opendev.org
     - status*.open*.org
     - storyboard-dev[0-9]*.opendev.org
     - storyboard[0-9]*.opendev.org
diff --git a/playbooks/service-static.yaml b/playbooks/service-static.yaml
index 5a739cdfa7..a425036101 100644
--- a/playbooks/service-static.yaml
+++ b/playbooks/service-static.yaml
@@ -1,4 +1,4 @@
-- hosts: "static_opendev:!disabled"
+- hosts: "static:!disabled"
   name: "Static webserver"
   roles:
     - role: kerberos-client