diff --git a/hieradata/roles/infra/automation/rundeck.yaml b/hieradata/roles/infra/automation/rundeck.yaml
index f46abc1..8fc070a 100644
--- a/hieradata/roles/infra/automation/rundeck.yaml
+++ b/hieradata/roles/infra/automation/rundeck.yaml
@@ -91,7 +91,7 @@ profiles::rundeck::server::key_storage_config:
     path: 'vault'
     config:
       prefix: 'rundeck'
-      address: https://vault.query.consul:8200
+      address: https://vault.service.consul:8200
       storageBehaviour: 'vault'
       secretBackend: rundeck
       engineVersion: '2'
diff --git a/hieradata/roles/infra/puppet/master.yaml b/hieradata/roles/infra/puppet/master.yaml
index 37ebf4f..ea51ac8 100644
--- a/hieradata/roles/infra/puppet/master.yaml
+++ b/hieradata/roles/infra/puppet/master.yaml
@@ -37,7 +37,7 @@ profiles::puppet::gems::puppet:
   - 'hiera-eyaml'
 
 profiles::helpers::certmanager::vault_config:
-  addr: 'https://vault.query.consul:8200'
+  addr: 'https://vault.service.consul:8200'
   mount_point: 'pki_int'
   approle_path: 'approle'
   role_name: 'servers_default'