diff --git a/hiera/common.yaml b/hiera/common.yaml
index 202ac172f9..6bde5009d9 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -16,7 +16,6 @@ cacti_hosts:
 - cacti.openstack.org
 - eavesdrop01.opendev.org
 - etherpad01.opendev.org
-- gitea-lb01.opendev.org
 - gitea-lb02.opendev.org
 - gitea01.opendev.org
 - gitea02.opendev.org
@@ -29,7 +28,6 @@ cacti_hosts:
 - grafana01.opendev.org
 - graphite02.opendev.org
 - jvb01.opendev.org
-- jvb02.opendev.org
 - kdc03.openstack.org
 - kdc04.openstack.org
 - keycloak01.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 8676fda694..d1aea648f8 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -105,12 +105,6 @@ all:
         region_name: DFW
       public_v4: 104.130.124.120
       public_v6: 2001:4800:7818:104:be76:4eff:fe02:b0ff
-    gitea-lb01.opendev.org:
-      ansible_host: 38.108.68.124
-      location:
-        cloud: openstackci-vexxhost
-        region_name: sjc1
-      public_v4: 38.108.68.124
     gitea-lb02.opendev.org:
       ansible_host: 38.108.68.66
       location:
@@ -202,13 +196,6 @@ all:
         region_name: DFW
       public_v4: 174.143.130.41
       public_v6: 2001:4800:7819:104:be76:4eff:fe04:53f1
-    jvb02.opendev.org:
-      ansible_host: 104.130.158.233
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 104.130.158.233
-      public_v6: 2001:4800:7818:104:be76:4eff:fe04:48c7
     keycloak01.opendev.org:
       ansible_host: 104.130.135.124
       location: