diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml
index 152700e4..afa281a7 100644
--- a/fe-common/overlay/etc/hiera/data/group.yaml
+++ b/fe-common/overlay/etc/hiera/data/group.yaml
@@ -50,7 +50,7 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_imagetag: 'staging'
+        haproxy_imagetag: 'stable'
 
       'mdeidas':
         site_name: 'md.eidas.swedenconnect.se'
@@ -70,7 +70,7 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_imagetag: 'staging'
+        haproxy_imagetag: 'stable'
 
       'test':
         site_name: 'test.swedenconnect.se'
@@ -90,7 +90,7 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_imagetag: 'staging'
+        haproxy_imagetag: 'stable'
 
       'proxy':
         site_name: 'proxy.eidas.swedenconnect.se'
@@ -116,7 +116,7 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_imagetag: 'staging'
+        haproxy_imagetag: 'stable'
 
       'md':
         site_name: 'md.swedenconnect.se'
@@ -136,4 +136,4 @@ sunet_frontend:
         allow_ports:
           - 443
         letsencrypt_server: 'acme-c.sunet.se'
-        haproxy_imagetag: 'staging'
+        haproxy_imagetag: 'stable'