diff --git a/playbooks/host_vars/firehose.openstack.org.yaml b/playbooks/group_vars/firehose.yaml
similarity index 100%
rename from playbooks/host_vars/firehose.openstack.org.yaml
rename to playbooks/group_vars/firehose.yaml
diff --git a/playbooks/roles/install-ansible/files/groups.yaml b/playbooks/roles/install-ansible/files/groups.yaml
index 6937900117..2deedb9956 100644
--- a/playbooks/roles/install-ansible/files/groups.yaml
+++ b/playbooks/roles/install-ansible/files/groups.yaml
@@ -11,6 +11,7 @@ groups:
   elasticsearch: inventory_hostname is match('elasticsearch0[1-7]\.openstack\.org')
   ethercalc: inventory_hostname.startswith('ethercalc')
   files: inventory_hostname.startswith('files')
+  firehose: inventory_hostname.startswith('firehose')
   futureparser: inventory_hostname is match('(review-dev\d*|groups\d*|groups-dev\d*|graphite\d*|etherpad-dev\d*|ask-staging\d*|codesearch\d*)\.openstack\.org')
   git-loadbalancer: inventory_hostname is match('git(-fe\d+)?\.openstack\.org')
   git-server: inventory_hostname is match('git\d+\.openstack\.org')