diff --git a/modules/keycloak/module.json b/modules/keycloak/module.json
index 1afc95e..083fd5b 100644
--- a/modules/keycloak/module.json
+++ b/modules/keycloak/module.json
@@ -51,7 +51,8 @@
     "oidc-client": {
       "authorization-path": "/protocol/openid-connect/auth",
       "token-path": "/protocol/openid-connect/token",
-      "userinfo-path": "/protocol/openid-connect/userinfo"
+      "userinfo-path": "/protocol/openid-connect/userinfo",
+      "issuer": "${setting:issuer}"
     }
   },
   "receives": {
diff --git a/modules/mailu/module.json b/modules/mailu/module.json
index 98447f6..df7943c 100644
--- a/modules/mailu/module.json
+++ b/modules/mailu/module.json
@@ -552,7 +552,8 @@
   ],
   "serves": {
     "smtp": {
-      "port": 587
+      "port": 587,
+      "domain": "${setting:domain}"
     }
   },
   "receives": {