diff --git a/hiera/common.yaml b/hiera/common.yaml
index 665593335c..ab856e6f04 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -190,6 +190,7 @@ cacti_hosts:
 - bridge.openstack.org
 - cacti.openstack.org
 - eavesdrop.openstack.org
+- eavesdrop01.opendev.org
 - elasticsearch02.openstack.org
 - elasticsearch03.openstack.org
 - elasticsearch04.openstack.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index f71c7d98c3..41f7237801 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -91,6 +91,13 @@ all:
         region_name: DFW
       public_v4: 104.130.158.239
       public_v6: 2001:4800:7818:104:be76:4eff:fe04:3bb2
+    eavesdrop01.opendev.org:
+      ansible_host: 104.239.144.232
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.239.144.232
+      public_v6: 2001:4800:7818:104:be76:4eff:fe04:46c8
     eavesdrop01.openstack.org:
       ansible_host: 104.130.124.113
       location:
diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 9a297de2b7..7902ee9aa5 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -49,7 +49,8 @@ groups:
   dns:
     - adns*.opendev.org
     - ns*.opendev.org
-  eavesdrop: eavesdrop[0-9]*.open*.org
+  eavesdrop: eavesdrop[0-9]*.openstack.org
+  eavesdrop_opendev: eavesdrop[0-9]*.opendev.org
   elasticsearch: elasticsearch[0-9]*.open*.org
   ethercalc: ethercalc*.open*.org
   etherpad: etherpad[0-9]*.open*.org
@@ -133,7 +134,7 @@ groups:
   puppet:
     - ask*.open*.org
     - cacti[0-9]*.open*.org
-    - eavesdrop[0-9]*.open*.org
+    - eavesdrop[0-9]*.openstack.org
     - elasticsearch[0-9]*.open*.org
     - ethercalc[0-9]*.open*.org
     - health[0-9]*.openstack.org
@@ -154,7 +155,7 @@ groups:
   puppet4:
     - ask*.open*.org
     - cacti[0-9]*.open*.org
-    - eavesdrop[0-9]*.open*.org
+    - eavesdrop[0-9]*.openstack.org
     - elasticsearch[0-9]*.open*.org
     - ethercalc[0-9]*.open*.org
     - health[0-9]*.openstack.org
diff --git a/playbooks/service-eavesdrop.yaml b/playbooks/service-eavesdrop.yaml
index 7fccfa317c..4b6afd43f0 100644
--- a/playbooks/service-eavesdrop.yaml
+++ b/playbooks/service-eavesdrop.yaml
@@ -4,6 +4,13 @@
   roles:
     - puppet-setup-ansible
 
+- hosts: 'eavesdrop_opendev:!disabled'
+  name: "eavesdrop: install services"
+  strategy: free
+  roles:
+    - iptables
+    - install-docker
+
 - hosts: 'eavesdrop:!disabled'
   name: "eavesdrop: run puppet on eavesdrop"
   strategy: free