diff --git a/hieradata/roles/infra/nomad/agentv2.yaml b/hieradata/roles/infra/nomad/agentv2.yaml
index 0e08f94..434016a 100644
--- a/hieradata/roles/infra/nomad/agentv2.yaml
+++ b/hieradata/roles/infra/nomad/agentv2.yaml
@@ -27,10 +27,10 @@ profiles::packages::include:
 profiles::nomad::node::client: true
 profiles::nomad::node::host_volumes:
   - name: puppetclient_crt
-    path: /etc/puppetlabs/puppet/ssl/certs/ausyd1nxvm2040.main.unkin.net.pem
+    path: /etc/puppetlabs/puppet/ssl/certs/%{facts.networking.fqdn}.pem
     read_only: true
   - name: puppetclient_key
-    path: /etc/puppetlabs/puppet/ssl/private_keys/ausyd1nxvm2040.main.unkin.net.pem
+    path: /etc/puppetlabs/puppet/ssl/private_keys/%{facts.networking.fqdn}.pem
     read_only: true
   - name: puppetclient_ca
     path: /etc/puppetlabs/puppet/ssl/certs/ca.pem