diff --git a/charts/nmaas/templates/nmaas-sp-deployment.yaml b/charts/nmaas/templates/nmaas-sp-deployment.yaml
index a7ad749bca005c101838cb0a894e9a1de3d308c9..674b3ce73e1a9fdd50468f9d50cf361997b19b09 100644
--- a/charts/nmaas/templates/nmaas-sp-deployment.yaml
+++ b/charts/nmaas/templates/nmaas-sp-deployment.yaml
@@ -48,7 +48,13 @@ spec:
           - name: SP_HOST
             value: {{ .Values.sp.host | default .Values.global.nmaasDomain | quote }}
           - name: SP_USED_ID
-            value: {{ .Values.sp.properties.idp.userId }}
+            value: {{ .Values.sp.properties.idp.userId | quote }}
+          - name: SP_REMOTE_USER
+            value: {{ .Values.sp.properties.idp.remoteUser | quote }}
+          - name: SP_SSO_ENTITY_ID
+            value: {{ .Values.sp.properties.idp.entityId | quote }}
+          - name: SP_METADATA_URL
+            value: {{ .Values.sp.properties.idp.metadataUrl | quote }}
       imagePullSecrets:
       - name: {{ .Values.global.registrysecret }}
 {{- end -}}
diff --git a/charts/nmaas/values.yaml b/charts/nmaas/values.yaml
index 94c9e0161ad9a90bce9150ed3a2472916581f563..1237e54db851dd4d2b7122f26afcf626ee6e2234 100644
--- a/charts/nmaas/values.yaml
+++ b/charts/nmaas/values.yaml
@@ -245,7 +245,7 @@ sp:
   name: nmaas-sp
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-sp
-    tag: "1.2.0"
+    tag: "1.6.3"
     pullPolicy: Always
   ingress:
     # -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
@@ -259,6 +259,9 @@ sp:
       name: edugain
       uri: https://login.terena.org/wayf/saml2/idp/metadata.php
       userId: uid
+      remoteUser: email
+      entityId: https://keycloak.example.com/realms/master
+      metadataUrl: https://keycloak.example.com/realms/master/protocol/saml/descriptor
 
 helm:
   enabled: true