diff --git a/hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml b/hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml
index b6b8454..de887ee 100644
--- a/hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml
+++ b/hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml
@@ -1,2 +1,4 @@
 ---
 profiles::postfix::gateway::myhostname: 'mta2.edge.unkin.net'
+profiles::pki::vault::alt_names:
+  - mta2.edge.unkin.net
diff --git a/hieradata/nodes/ausyd2nxvm2130.main.unkin.net.yaml b/hieradata/nodes/ausyd2nxvm2130.main.unkin.net.yaml
index b12ce28..9203cff 100644
--- a/hieradata/nodes/ausyd2nxvm2130.main.unkin.net.yaml
+++ b/hieradata/nodes/ausyd2nxvm2130.main.unkin.net.yaml
@@ -1,2 +1,4 @@
 ---
 profiles::postfix::gateway::myhostname: 'mta1.edge.unkin.net'
+profiles::pki::vault::alt_names:
+  - mta1.edge.unkin.net
diff --git a/hieradata/roles/infra/mail/gateway.yaml b/hieradata/roles/infra/mail/gateway.yaml
index 521fe31..0136d7a 100644
--- a/hieradata/roles/infra/mail/gateway.yaml
+++ b/hieradata/roles/infra/mail/gateway.yaml
@@ -81,9 +81,11 @@ postfix::manage_aliases: true
 # postfix map content (templates)
 profiles::postfix::gateway::relay_recipients_maps:
   '@unkin.net': 'OK'
+  '@main.unkin.net': 'OK'
 
 profiles::postfix::gateway::relay_domains_maps:
   'unkin.net': 'OK'
+  'main.unkin.net': 'OK'
 
 profiles::postfix::gateway::postscreen_access_maps:
   '127.0.0.1/32': 'permit'
@@ -104,6 +106,10 @@ postfix::transports:
     ensure: present
     destination: 'relay'
     nexthop: '[mail-in.main.unkin.net]:25'
+  'main.unkin.net':
+    ensure: present
+    destination: 'relay'
+    nexthop: '[mail-in.main.unkin.net]:25'
 
 # postfix virtuals
 postfix::virtuals: