diff --git a/roles/engine/defaults/main.yml b/roles/engine/defaults/main.yml
index f5bbc3495..2fb50450f 100644
--- a/roles/engine/defaults/main.yml
+++ b/roles/engine/defaults/main.yml
@@ -90,6 +90,9 @@ engine_sbs_attributes_allowed:
   - 'urn:mace:dir:attribute-def:uid'
   - 'urn:mace:dir:attribute-def:eduPersonPrincipalName'
   - 'urn:oid:1.3.6.1.4.1.24552.500.1.1.1.13'
+  - 'urn:oid:1.3.6.1.4.1.25178.4.1.5' # voPersonExternalID
+  - 'urn:oid:1.3.6.1.4.1.25178.4.1.6' # voPersonID
+  - 'urn:oid:1.3.6.1.4.1.25178.4.1.8' # voPersonSoRID
 
 ## The minimum priority of messages that will be logged
 engine_logging_passthru_level: NOTICE
diff --git a/roles/oidcng/files/oidc_saml_mapping.json b/roles/oidcng/files/oidc_saml_mapping.json
index dfb18a969..ce52a8a2d 100644
--- a/roles/oidcng/files/oidc_saml_mapping.json
+++ b/roles/oidcng/files/oidc_saml_mapping.json
@@ -124,5 +124,20 @@
     "saml": "urn:mace:dir:attribute-def:preferredLanguage",
     "oidc": "locale",
     "multiValue": false
+  },
+  {
+    "saml": "urn:oid:1.3.6.1.4.1.25178.4.1.5",
+    "oidc": "voperson_external_id",
+    "multiValue": true
+  },
+  {
+    "saml": "urn:oid:1.3.6.1.4.1.25178.4.1.6",
+    "oidc": "voperson_id",
+    "multiValue": true
+  },
+  {
+    "saml": "urn:mace:surf.nl:attribute-def:ssh-key",
+    "oidc": "ssh_public_key",
+    "multiValue": true
   }
 ]