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 7bdc0def..ca58ab73 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
@@ -14,7 +14,7 @@ spring:
         jwt:
           public-key-location: classpath:oauth/as.pub
           audiences:
-            - jocar
+            - ${idm.oauth2-id}
   ssl:
     bundle:
       pem:
@@ -79,8 +79,8 @@ idm:
   mrecord:
     api:
       connector-id: https://test.idm.eidas.swedenconnect.se/connector
-      check-scope: dismay-smitten-unfasten-dastardly/idrecord_check
-      get-scope: dismay-smitten-unfasten-dastardly/idrecord_get
+      check-scope:  ${idm.oauth2-id}/idrecord_check
+      get-scope: ${idm.oauth2-id}/idrecord_get
     db:
       key-store-type: jceks
       key-store: classpath:dbkey.jceks