diff --git a/fe-test-common/overlay/etc/hiera/data/group.yaml b/fe-test-common/overlay/etc/hiera/data/group.yaml
index f8d2c656..7679ed2d 100644
--- a/fe-test-common/overlay/etc/hiera/data/group.yaml
+++ b/fe-test-common/overlay/etc/hiera/data/group.yaml
@@ -70,7 +70,7 @@ sunet_frontend:
         haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'test'
         frontendtools_image: docker.sunet.se/eidas-frontend-tools
-        frontendtools_imagetag: 'stable'
+        frontendtools_imagetag: 'staging'
 
       'proxytest':
         site_name: 'test.proxy.eidas.swedenconnect.se'
@@ -93,7 +93,7 @@ sunet_frontend:
         haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'test'
         frontendtools_image: docker.sunet.se/eidas-frontend-tools
-        frontendtools_imagetag: 'stable'
+        frontendtools_imagetag: 'staging'
 
       'mdeidastest':
         site_name: 'test.md.eidas.swedenconnect.se'
@@ -116,7 +116,7 @@ sunet_frontend:
         haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'test'
         frontendtools_image: docker.sunet.se/eidas-frontend-tools
-        frontendtools_imagetag: 'stable'
+        frontendtools_imagetag: 'staging'
 
       'mdtest':
         site_name: 'test.md.swedenconnect.se'
@@ -139,7 +139,7 @@ sunet_frontend:
         haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'test'
         frontendtools_image: docker.sunet.se/eidas-frontend-tools
-        frontendtools_imagetag: 'stable'
+        frontendtools_imagetag: 'staging'
 
       'validatortst':
         site_name: 'test.validator.swedenconnect.se'
@@ -159,4 +159,4 @@ sunet_frontend:
         haproxy_image: docker.sunet.se/eidas-haproxy
         haproxy_imagetag: 'test'
         frontendtools_image: docker.sunet.se/eidas-frontend-tools
-        frontendtools_imagetag: 'stable'
+        frontendtools_imagetag: 'staging'