diff --git a/hieradata/country/au/region/syd1/infra/puppetboard/server.yaml b/hieradata/country/au/region/syd1/infra/puppetboard/server.yaml
deleted file mode 100644
index cbc7f43..0000000
--- a/hieradata/country/au/region/syd1/infra/puppetboard/server.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-profiles::puppet::puppetboard::nginx_aliases:
-  - puppetboard.service.consul
-  - puppetboard.query.consul
-  - "%{facts.networking.fqdn}"
diff --git a/hieradata/roles/infra/puppetboard/server.yaml b/hieradata/roles/infra/puppetboard/server.yaml
index d74c880..d835603 100644
--- a/hieradata/roles/infra/puppetboard/server.yaml
+++ b/hieradata/roles/infra/puppetboard/server.yaml
@@ -1,9 +1,17 @@
 ---
+# additional servername aliases
+profiles::puppet::puppetboard::nginx_aliases:
+  - puppetboard.service.consul
+  - puppetboard.query.consul
+  - "puppetboard.service.%{facts.country}-%{facts.region}.consul"
+  - "%{facts.networking.fqdn}"
+
 # additional altnames
 profiles::pki::vault::alt_names:
   - puppetboard.main.unkin.net
   - puppetboard.service.consul
   - puppetboard.query.consul
+  - "puppetboard.service.%{facts.country}-%{facts.region}.consul"
 
 consul::services:
   puppetboard: