diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml
index 891e2acd..3ecab5e5 100644
--- a/fe-common/overlay/etc/hiera/data/group.yaml
+++ b/fe-common/overlay/etc/hiera/data/group.yaml
@@ -50,7 +50,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
+        haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'stable'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'mdeidas':
@@ -71,7 +73,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
+        haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'stable'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'test':
@@ -92,7 +96,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
+        haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'stable'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'proxy':
@@ -142,7 +148,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
+        haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'stable'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'demweidas':
@@ -163,7 +171,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
+        haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'stable'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'validator':