diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml
index 07a4f0bc..02b2a580 100644
--- a/fe-common/overlay/etc/hiera/data/group.yaml
+++ b/fe-common/overlay/etc/hiera/data/group.yaml
@@ -52,7 +52,7 @@ sunet_frontend:
         letsencrypt_server: 'acme-c.sunet.se'
         haproxy_imagetag: 'staging'
 
-      'md.eidas':
+      'mdeidas':
         site_name: 'md.eidas.swedenconnect.se'
         frontends:
           'fe-fre-3.komreg.net':
@@ -64,6 +64,9 @@ sunet_frontend:
             'eupub-1.komreg.net':
               ips: ['94.176.224.200']
               server_args: 'ssl check verify none'
+            'eupub-2.komreg.net':
+              ips: ['94.176.224.72']
+              server_args: 'ssl check verify none'
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
@@ -81,8 +84,10 @@ sunet_frontend:
             'natpub-1.komreg.net':
               ips: ['94.176.224.199']
               server_args: 'ssl check verify none'
+            'natpub-2.komreg.net':
+              ips: ['94.176.224.71']
+              server_args: 'ssl check verify none'
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
         haproxy_imagetag: 'staging'
-
diff --git a/fe-common/overlay/opt/frontend/config/md.eidas/haproxy.j2 b/fe-common/overlay/opt/frontend/config/mdeidas/haproxy.j2
similarity index 100%
rename from fe-common/overlay/opt/frontend/config/md.eidas/haproxy.j2
rename to fe-common/overlay/opt/frontend/config/mdeidas/haproxy.j2