diff --git a/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb
index d0ef5cd6..7bdc0def 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb
@@ -91,7 +91,7 @@ idm:
     destination-url: https://sandbox.swedenconnect.se/auth/be/auth # Id-Tjänsten
     auth-return-url: https://test.idm.eidas.swedenconnect.se:443/idm/auth/sp/return
     discover-return-url: https://test.idm.eidas.swedenconnect.se:443/idm/auth/sign/sp/return
-    client-id: digg-idm-dev
+    client-id: <%= scope.call_function('safe_hiera', ['client_id'])  %>
     trusted-certificates:
     - classpath:idp.cert
     id-strategy: STATIC
diff --git a/idm-test-common/overlay/etc/hiera/data/group.yaml b/idm-test-common/overlay/etc/hiera/data/group.yaml
index 49196aea..cc3118d9 100644
--- a/idm-test-common/overlay/etc/hiera/data/group.yaml
+++ b/idm-test-common/overlay/etc/hiera/data/group.yaml
@@ -9,3 +9,4 @@ redis_cluster_nodes:
   - 89.47.185.217
   - 89.47.185.218
   - 89.45.236.157
+client_id: digg-idm-sunet-qa