diff --git a/hiera/common.yaml b/hiera/common.yaml
index a3cf671610..5cfbaefd07 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -23,7 +23,6 @@ cacti_hosts:
 - gitea12.opendev.org
 - gitea13.opendev.org
 - gitea14.opendev.org
-- grafana01.opendev.org
 - grafana02.opendev.org
 - graphite02.opendev.org
 - jvb01.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 8fa0b98f9b..8b8dfc9875 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -231,17 +231,6 @@ all:
         - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbwucdMMhoyxPTBEqWF3WO0uS3OAaAmBZCGVGrzq6BB26HLrzN662rBJ523LWxsbEMVmTCXhBpwfg1JzAxWThe6KjpL30hJPb83VRv1k96Czo3QlQZ+NsKo1paFnNBQnVELcDZoE5+B8NMLK7C8AuUHmpsEyEiyfs4F7mUEp0JD28zt2I5u27eZEsEa5O9iaDEpW/Mduqv2QrxZNyJnfcAy5TRkLBIISuTDy6PaL3bTvpfHOJpe1pG3sqJ80CXNFxnhscTNzgMLjnC1HeUfwqw3OB0ZLKMKJO2yWtGASF6bMDu+0Mqx12LXPEMK4HnWjoZOmUr1uTeL+rY2/4S7CWb4jDIAqtunmWvlt4zvzdSxiq+ZxbLw6EvGUISxZCbY+WsyD4u6WUBEXEnvJb3mhLrrPenLdHC1q9bmB6SEnTcwCYEblDP6gNBwuuJMpoTE9W0KmtraCAxtl+PerpYpCn6ey89y9it5e+Wk4DhV3EyddJNzgeYht6xiQp4SbyoZys='
         - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIC7JmcruitQMiRnYHQioq8gZyZRumY7hZBk+QRE7gltOJbBaSF3pTrvOm3+sn6Pva+/XbPTLRS8b5FnruDZG1Y='
         - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvPS8qEB6cgsXonbtBS+M8XHFsulxoILphg6edC4PZ8'
-    grafana01.opendev.org:
-      ansible_host: 198.101.251.7
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 198.101.251.7
-      public_v6: 2001:4800:7821:102:be76:4eff:fe04:3bad
-      host_keys:
-        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINuErqGwtxFWgfg3a44N2z8/pOihQNr5k2LAHTP9cno'
-        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJcH3qQHqiAlr0S0Hmr6a6x/WRnc1w6EQn8JhN7tGuN2waWV2bzzJKa8yaOThwH/EkJWk29sa5l1Ig/OXEuy1WnLK9buEEc0LidDn2ekEDyNCuVdQ96Fu1UGhhtOll6sljBzYZAOfMufnSlV+dX0OdiDPvL4Saz0Pf8r//jc87wuPAztQFiPixT/FcIXSrsl265rc8KuaN4rMG9rrQHA5Zpm/mnx2Sap770+C07ygyaQ+HW9gat3LXV7ELvffOvUmIpGFhyQugTmGEhWtEmsg2mPIiFPGOhIKNZPKtHyRxquifb3PlQ8dsx0JOILd1F12gibw2tezsNzqSWswPTwZ9IIW4jWSt9Srk3+dnXIg+J7w23blXbPm4S91a4hBOHGfgEAH9ALsDhCjQ/spto4e4czabDvenHK3vN6/XVK7bcl0wp+j9qKrNNhzYxTwcEJXF/1uTkjfI0mySn8xYQX6wiwW6l7UIyAqcY9+GuYNz0DIXaBO/W3s5CFtmCRQeYy8='
-        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxJpz56ZCrJXXI3Sv2y1UHOUL18OR3HSV01XcJjSEtKtmqwhmmJnrQp5ax8t34s9OgpMhA8l3KVwDFAtiFBJxE='
     grafana02.opendev.org:
       ansible_host: 104.239.145.144
       location:
diff --git a/inventory/service/host_vars/grafana01.opendev.org.yaml b/inventory/service/host_vars/grafana01.opendev.org.yaml
deleted file mode 100644
index 9c0d00239d..0000000000
--- a/inventory/service/host_vars/grafana01.opendev.org.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-letsencrypt_certs:
-  grafana01-opendev-org-main:
-    - grafana01.opendev.org
-    - grafana.opendev.org
-    - grafana.openstack.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 30ce44df61..bef5a29cbd 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -150,9 +150,6 @@
 
 # Grafana
 
-- name: letsencrypt updated grafana01-opendev-org-main
-  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
 - name: letsencrypt updated grafana02-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 6f7c485a79..7b3d82fb41 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -556,7 +556,6 @@
     files:
       - inventory/base
       - playbooks/service-grafana.yaml
-      - inventory/service/host_vars/grafana01.org.yaml
       - inventory/service/host_vars/grafana02.org.yaml
       - inventory/service/group_vars/grafana
       - playbooks/roles/install-docker/