diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index de0502c7..e8872dc6 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -40,6 +40,12 @@ p1.komreg.net:
             - 'se-tug-lb-1.sunet.se'
          port: '443'
 
+p2.qa.komreg.net:
+   sunet_iaas_cloud:
+   autoupdate:
+   md_publisher:
+     keyname: p2.qa.komreg.net_infra
+
 '^md[\-0-9].+\.komreg\.net$':
    sunet_iaas_cloud:
    autoupdate:
@@ -55,6 +61,7 @@ md1.komreg.net:
 md-eu1.komreg.net:
    md_signer:
       name: eidas
+      dest_host: p2.qa.komreg.net
 
 '^eidas-node-[0-9]+\.qa\.sveidas\.se$':
    openstack_dockerhost:
diff --git a/p2.qa.komreg.net/overlay/etc/hiera/data/local.yaml b/p2.qa.komreg.net/overlay/etc/hiera/data/local.yaml
new file mode 100644
index 00000000..707397ca
--- /dev/null
+++ b/p2.qa.komreg.net/overlay/etc/hiera/data/local.yaml
@@ -0,0 +1,3 @@
+---
+publisher_ssh_key: AAAAC3NzaC1lZDI1NTE5AAAAIJrzCjtN8nf5+MhNgAR61vAd6/6dSvfBDCm5oaGeXIXH
+publisher_ssh_key_type: ssh-ed25519