diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 42b8e47..555a2b3 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -180,6 +180,8 @@ profiles::packages::remove:
 profiles::base::scripts::scripts:
   puppet: puppetwrapper.py
 
+profiles::puppet::client::server: 'puppet.query.consul'
+profiles::puppet::client::ca_server: 'puppetca.query.consul'
 profiles::puppet::client::environment: 'develop'
 profiles::puppet::client::runinterval: 1800
 profiles::puppet::client::runtimeout: 3600
diff --git a/hieradata/roles/infra/puppet/master.yaml b/hieradata/roles/infra/puppet/master.yaml
index 4f3b6d8..07ae874 100644
--- a/hieradata/roles/infra/puppet/master.yaml
+++ b/hieradata/roles/infra/puppet/master.yaml
@@ -37,6 +37,9 @@ profiles::helpers::certmanager::vault_config:
   output_path: '/tmp/certmanager'
   role_id: "%{lookup('certmanager::role_id')}"
 
+profiles::puppet::server::agent_server: 'puppet.query.consul'
+profiles::puppet::server::report_server: 'puppet.query.consul'
+profiles::puppet::server::ca_server: 'puppetca.query.consul'
 profiles::puppet::server::dns_alt_names:
   - "%{facts.networking.fqdn}"
   - "%{facts.networking.hostname}"