diff --git a/fe-test-common/overlay/etc/hiera/data/group.yaml b/fe-test-common/overlay/etc/hiera/data/group.yaml
index 38f41991..f8d2c656 100644
--- a/fe-test-common/overlay/etc/hiera/data/group.yaml
+++ b/fe-test-common/overlay/etc/hiera/data/group.yaml
@@ -7,7 +7,7 @@ sunet_frontend:
     port80_acme_c_backend: 'letsencrypt_acme-c.sunet.se'
     static_backends:
       letsencrypt_acme-c.sunet.se.se:
-        - '89.45.232.90'  # note: port 80
+        - '89.47.184.10'  # note: port 80
 
     peers:
       loke.sunet.se:
@@ -67,8 +67,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_image: docker.sunet.se/eduid/haproxy
-        haproxy_imagetag: 'stable-tug'
+        haproxy_image: docker.sunet.se/eidas-haproxy
+        haproxy_imagetag: 'test'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'proxytest':
@@ -89,8 +90,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_image: docker.sunet.se/eduid/haproxy
-        haproxy_imagetag: 'stable-tug'
+        haproxy_image: docker.sunet.se/eidas-haproxy
+        haproxy_imagetag: 'test'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'mdeidastest':
@@ -111,8 +113,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_image: docker.sunet.se/eduid/haproxy
-        haproxy_imagetag: 'stable-tug'
+        haproxy_image: docker.sunet.se/eidas-haproxy
+        haproxy_imagetag: 'test'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'mdtest':
@@ -133,8 +136,9 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_image: docker.sunet.se/eduid/haproxy
-        haproxy_imagetag: 'stable-tug'
+        haproxy_image: docker.sunet.se/eidas-haproxy
+        haproxy_imagetag: 'test'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'
 
       'validatortst':
@@ -152,6 +156,7 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_image: docker.sunet.se/eduid/haproxy
-        haproxy_imagetag: 'stable-tug'
+        haproxy_image: docker.sunet.se/eidas-haproxy
+        haproxy_imagetag: 'test'
+        frontendtools_image: docker.sunet.se/eidas-frontend-tools
         frontendtools_imagetag: 'stable'