diff --git a/CHANGELOG.md b/CHANGELOG.md
index 288be47..6bdec0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+22.1.0 (11-09-2022)
+===================
+
+* Added the institution SSO integration guide
+* Synchronized the repo copy of institutions-auth.xsl against helm charts
+* Updated local configs for fakeCAS IdP with institution osftype0
+* Migrated okstate SSO from CAS to SAML
+* Updated readme accordingly 
+
 22.0.7 (10-06-2022)
 ===================
 
diff --git a/README.md b/README.md
index e2f26e2..56bb2da 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ Details coming soon ...
 
 Details coming soon ...
 
-#### `fakeCAS` Login (Local Development Only)
+#### `fakeCAS` Login for institution `osftype0` (Local Development Only)
 
 With OSF CAS running locally as the authentication server for OSF, the previously disabled `fakeCAS` can be re-configured to serve as an identity provider. Simply update `fakecas` in OSF's [docker-compose.yaml](https://github.com/CenterForOpenScience/osf.io/blob/dc87c86b2afb7ad4e801b23c6428e3d2169e3e36/docker-compose.yml#L235-L247) to listen on port `8081`.
 
@@ -146,10 +146,10 @@ Related `cas.propeties` settings can be found [here](https://github.com/CenterFo
 
 cas.authn.osf-postgres.institution-clients[2]=${cas.authn.pac4j.cas[2].client-name}
 
-cas.authn.pac4j.cas[2].login-url=http://192.168.168.167:8081/login
-cas.authn.pac4j.cas[2].client-name=fakecas
-cas.authn.pac4j.cas[2].protocol=CAS30
-cas.authn.pac4j.cas[2].callback-url-type=QUERY_PARAMETER
+cas.authn.pac4j.cas[1].login-url=http://192.168.168.167:8081/login
+cas.authn.pac4j.cas[1].client-name=osftype0
+cas.authn.pac4j.cas[1].protocol=CAS30
+cas.authn.pac4j.cas[1].callback-url-type=QUERY_PARAMETER
 ```
 
 ### OAuth 2.0 Server
diff --git a/README_INSTITUTION_SSO_INTEGRATION_GUIDE.md b/README_INSTITUTION_SSO_INTEGRATION_GUIDE.md
new file mode 100644
index 0000000..be2a759
--- /dev/null
+++ b/README_INSTITUTION_SSO_INTEGRATION_GUIDE.md
@@ -0,0 +1,81 @@
+# Connecting to the Open Science Framework (OSF) via our Shibboleth/SAML Service Provider
+
+This article provides general information about the COS's Shibboleth/SAML SSO integration for organizations who have signed the *OSF for Institutions Offer of Services* letter.
+
+## What is Single Sign-On?
+
+In general, Single Sign-On, or SSO, allows users authenticated with one trusted system (e.g. university network) to also authenticate using those same “home” credentials with another trusted network (e.g. OSF). In the case of the second authentication, users are not asked to log in again, but instead the authenticated credentials are shared between systems.
+
+## Who can use Single Sign-On with OSF?
+
+Organizations that have implemented a SAML 2.0 Identity Provider (IdP) and signed the *OSF for Institutions Offer of Services* are eligible to use this feature.
+
+### A few notes:
+
+* Current OSF users who have already set up accounts with a different login, will be able to retain those credentials and choose to login with personal or institutional credentials.
+
+* Users’ authentication to the OSF service using SSO cannot also use the “forgot Password” link on the OSF website to remind them of their credentials, as their user credentials are specific to and managed by their organization.
+
+* OSF also provides extra features such as Shared SSO, Selective SSO and Institutional Dashboard, which all require extra configurations. This guide does not include technical guide for them since they are institution and/or SSO specific. 
+
+## Technical Implementation
+
+### Institutions registered with the InCommon Federation
+
+The InCommon Federation provides secure single sign-on access to cloud and local services, and global collaboration tools. COS is a [Research & Scholarship Entity Category (R&S)](https://refeds.org/category/research-and-scholarship) Service Provider (SP) registered with the [InCommon Federation](https://www.incommon.org/federation/).
+
+> * SP Entity ID: `https://accounts.osf.io/shibboleth`
+> * Required Attributes:
+>   * `eduPersonPrincipalName` for user's institutional identity
+>   * `mail` for user's email
+>   * `displayName` for user's full name (or a pair of `givenName` **AND** `sn` for user's first and last name)
+
+* Note that only COS's production SP server is registered with the InCommon Federation. Both IdP and SP being registered with InCommon makes it no longer necessary to configure a test server before going production. If you need to connect to COS's test SP server, follow the notes mentioned in **Other Institutions** below.
+
+
+### Institutions registered with eduGAIN Participants
+
+[eduGAIN](https://edugain.org/) is a global service that provides an efficient, flexible way for participating federations, and their affiliated users and services, to interconnect. The InCommon Federation is the U.S. participant. If your institution is registered with your local participant, you can use the above guide. Note that you may need to enable **interfederation** if it is an option and if it is disabled by default. Learn more about eduGAIN from [what is eduGAIN](https://edugain.org/about-edugain/what-is-edugain/), [key concepts](https://edugain.org/about-edugain/key-concepts/), [participants](https://technical.edugain.org/status) and [usage guide](https://edugain.org/participants/how-to-use-edugain/); learn more about interfederation from [InCommon's perspective](https://spaces.at.internet2.edu/display/federation/Interfederation+and+eduGAIN).
+
+### Other Institutions
+
+For institutions that are not registered with any participant of eduGAIN, COS offers a [SAML 2.0](https://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-tech-overview-2.0.html) Service Provider (SP) using [Shibboleth 2.0](https://wiki.shibboleth.net/confluence/display/SHIB2/Home). Follow the following guide to manually configure your IdP server. 
+
+* Ensure that your IT administrators have loaded COS's SP metadata into your IdP.
+  * Production: https://accounts.osf.io/Shibboleth.sso/Metadata
+  	* Entity ID: `https://accounts.osf.io/shibboleth`
+
+  * Test and/or staging: https://accounts.test.osf.io/Shibboleth.sso/Metadata
+    * Entity ID: `https://accounts.test.osf.io/shibboleth`
+
+* Ensure that your IT administrators are releasing the three required pieces of information listed below. Inform COS of the attribute name you use for each of them.
+  * Required Attribute
+    * Unique identifier for the user
+    * User's institutional email
+    * Either of the follwoing two
+        * User's full name
+        * User's first **AND** last name
+  * Attribute name and format
+    * We strongly recommend using URNs that are already configured and mapped in our SP server. Athough we support many format, `eduPerson`(https://wiki.refeds.org/display/STAN/eduPerson) is the preferred one. Here are the URNs for aformentioned required attributes.
+      * For identity, there are two options, please let us know which one you choose.
+	    * `urn:oid:1.3.6.1.4.1.5923.1.1.1.6`: this is the `eppn` which needs to be scoped with the default delimiter `@`.
+	      * This attribute looks like an email; it may or may not be an actual email; but it **SHOULD NOT** be used for the email attribute.
+		* `urn:oid:0.9.2342.19200300.100.1.1`: this is the `uid` which doesn't need to be scoped
+	  * For the email, use `urn:oid:0.9.2342.19200300.100.1.3`, which is the `mail`
+	  * For the full name, use `urn:oid:2.16.840.1.113730.3.1.241`, which is the `displayName`
+	  * For the first name, use `urn:oid:2.5.4.42`, which is the `givenName`
+	  * For the last name, use `urn:oid:2.5.4.4`, which is the `sn`
+
+* Provide COS with the metadata URL for your IdP server.
+
+* Provide COS with the entiry ID for your IdP server, which should be the same as the one defined in your metadata.
+
+* It is recommended that a temporary institution test account is created for COS engineers if possible, which will significantly aid and accelerate the process.
+
+### For All Institutions
+
+Inform COS of the user you would like to test with; your COS contact will ensure your account is ready to go and will send you a link to test the SSO configuration setup for your institution.
+
+## Alternative SSO Options
+
+COS strongly recommends using SAML SSO when connecting to the OSF. However, if this is not available at your institution, inform COS of alternative SSO options you have.
diff --git a/etc/cas/config/cas.properties b/etc/cas/config/cas.properties
index 34c5696..dae3712 100644
--- a/etc/cas/config/cas.properties
+++ b/etc/cas/config/cas.properties
@@ -260,11 +260,6 @@ cas.authn.pac4j.cas[0].login-url=${CAS_CORD_LOGIN_URL:https://bprdeis.cord.edu:8
 cas.authn.pac4j.cas[0].client-name=cord
 cas.authn.pac4j.cas[0].protocol=SAML
 cas.authn.pac4j.cas[0].callback-url-type=QUERY_PARAMETER
-#
-cas.authn.pac4j.cas[1].login-url=${CAS_OKSTATE_LOGIN_URL:https://stwcas.okstate.edu/cas/login}
-cas.authn.pac4j.cas[1].client-name=okstate
-cas.authn.pac4j.cas[1].protocol=SAML
-cas.authn.pac4j.cas[1].callback-url-type=QUERY_PARAMETER
 ########################################################################################################################
 
 ########################################################################################################################
diff --git a/etc/cas/config/instn-authn-prod.xsl b/etc/cas/config/instn-authn-prod.xsl
index 0fe3aa6..f61f09e 100644
--- a/etc/cas/config/instn-authn-prod.xsl
+++ b/etc/cas/config/instn-authn-prod.xsl
@@ -5,7 +5,6 @@
             <xsl:apply-templates/>
         </provider>
     </xsl:template>
-
     <xsl:template match="auth">
         <xsl:variable name="delegation-protocol" select="//attribute[@name='delegation-protocol']/@value" />
         <xsl:choose>
@@ -13,6 +12,18 @@
                 <xsl:variable name="idp" select="//attribute[@name='shib-identity-provider']/@value" />
                 <idp><xsl:value-of select="$idp"/></idp>
                 <xsl:choose>
+                    <!-- Albion College (ALBION) -->
+                    <xsl:when test="$idp='ethos01w.albion.edu'">
+                        <id>albion</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName/>
+                            <givenName/>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Arizona State University (ASU) -->
                     <xsl:when test="$idp='urn:mace:incommon:asu.edu'">
                         <id>asu</id>
@@ -85,6 +96,8 @@
                             <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
                             <middleNames/>
                             <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='primary-affiliation']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
                         </user>
                     </xsl:when>
                     <!-- Cornell University (CORNELL) -->
@@ -135,6 +148,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Erasmus University Rotterdam (EUR) -->
+                    <xsl:when test="$idp='https://sts.windows.net/715902d6-f63e-4b8d-929b-4bb170bad492/'">
+                        <id>eur</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Ferris State University (FERRIS) -->
                     <xsl:when test="$idp='login.ferris.edu'">
                         <id>ferris</id>
@@ -157,6 +182,21 @@
                             <givenName/>
                             <middleNames/>
                             <suffix/>
+                            <userRoles><xsl:value-of select="//attribute[@name='userroles']/@value"/></userRoles>
+                        </user>
+                    </xsl:when>
+                    <!-- Georgia Institute of Technology (GATECH) -->
+                    <xsl:when test="$idp='https://idp.gatech.edu/idp/shibboleth'">
+                        <id>gatech</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <middleNames/>
+                            <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='department']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
                         </user>
                     </xsl:when>
                     <!-- George Mason University (GMU) -->
@@ -183,6 +223,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Harvard University (HARVARD) -->
+                    <xsl:when test="$idp='https://fed.huit.harvard.edu/idp/shibboleth'">
+                        <id>harvard</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Illinois Institute of Technology (IIT) -->
                     <xsl:when test="$idp='https://login.iit.edu/cas/idp'">
                         <id>iit</id>
@@ -267,6 +319,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Nesta -->
+                    <xsl:when test="$idp='JumpCloud'">
+                        <id>nesta</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- New York University (NYU) -->
                     <xsl:when test="$idp='urn:mace:incommon:nyu.edu'">
                         <id>nyu</id>
@@ -279,6 +343,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- OK State University (OKSTATE) -->
+                    <xsl:when test="$idp='https://stwcas.okstate.edu/idp'">
+                        <id>okstate</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- The University of Oklahoma (OU) -->
                     <xsl:when test="$idp='https://shib.ou.edu/idp/shibboleth'">
                         <id>ou</id>
@@ -294,6 +370,20 @@
                     <!-- Princeton University (PU) -->
                     <xsl:when test="$idp='https://idp.princeton.edu/idp/shibboleth'">
                         <id>pu</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='department']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
+                        </user>
+                    </xsl:when>
+                    <!-- Purdue University (PURDUE) -->
+                    <xsl:when test="$idp='https://idp.purdue.edu/idp/shibboleth'">
+                        <id>purdue</id>
                         <user>
                             <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
                             <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
@@ -424,7 +514,7 @@
                             <middleNames />
                             <suffix/>
                         </user>
-                    </xsl:when> 
+                    </xsl:when>
                     <!-- University of Cincinnati (UC) -->
                     <xsl:when test="$idp='https://login.uc.edu/idp/shibboleth'">
                         <id>uc</id>
@@ -485,6 +575,32 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- University of Manchester (UOM) -->
+                    <xsl:when test="$idp='https://shib.manchester.ac.uk/shibboleth'">
+                        <id>uom</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <isSelectiveSso>true</isSelectiveSso>
+                            <selectiveSsoFilter><xsl:value-of select="//attribute[@name='selectivessofilter']/@value"/></selectiveSsoFilter>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
+                    <!-- University of Maryland, Baltimore (UMB) -->
+                    <xsl:when test="$idp='https://webauth.umaryland.edu/idp/shibboleth'">
+                        <id>umb</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- University of Maryland (UMD)-->
                     <xsl:when test="$idp='urn:mace:incommon:umd.edu'">
                         <id>umd</id>
@@ -521,6 +637,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- University of London (UOL) -->
+                    <xsl:when test="$idp='https://idp.uolia.london.ac.uk/shibboleth'">
+                        <id>uol</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='eppn']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- University of Southern California (USC) -->
                     <xsl:when test="$idp='https://shibboleth.usc.edu/shibboleth-idp'">
                         <id>usc</id>
@@ -533,14 +661,14 @@
                             <suffix/>
                         </user>
                     </xsl:when>
-                    <!--University of South Carolina Libraries (USC) -->
-                    <xsl:when test="$idp='urn:mace:incommon:sc.edu'">
+                    <!-- University of South Carolina (SC) -->
+                    <xsl:when test="$idp='https://cas.auth.sc.edu/cas/idp'">
                         <id>sc</id>
                         <user>
-                            <username><xsl:value-of select="//attribute[@name='eppn']/@value"/></username>
-                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
                             <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
                             <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <fullname/>
                             <middleNames/>
                             <suffix/>
                         </user>
@@ -619,6 +747,20 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Vrije Universiteit Amsterdam (VUA) -->
+                    <xsl:when test="$idp='http://stsfed.login.vu.nl/adfs/services/trust'">
+                        <id>vua</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName/>
+                            <givenName/>
+                            <middleNames/>
+                            <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='department']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
+                        </user>
+                    </xsl:when>
                     <!-- Washington University in St. Louis (WUSTL) -->
                     <xsl:when test="$idp='https://login.wustl.edu/idp/shibboleth'">
                         <id>wustl</id>
@@ -646,23 +788,11 @@
                         <id>cord</id>
                         <user>
                             <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
-                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <fullname><xsl:value-of select="//attribute[@name='displayName']/@value"/></fullname>
                             <familyName />
                             <givenName />
-                            <middleNames/>
-                            <suffix/>
-                        </user>
-                    </xsl:when>
-                    <!-- OK State University (OKSTATE) -->
-                    <xsl:when test="$idp='okstate'">
-                        <id>okstate</id>
-                        <user>
-                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
-                            <fullname/>
-                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
-                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
-                            <middleNames/>
-                            <suffix/>
+                            <middleNames />
+                            <suffix />
                         </user>
                     </xsl:when>
                     <!-- Unknown Identity Provider -->
diff --git a/etc/cas/config/instn-authn-test.xsl b/etc/cas/config/instn-authn-test.xsl
index b3c847c..00c6d37 100644
--- a/etc/cas/config/instn-authn-test.xsl
+++ b/etc/cas/config/instn-authn-test.xsl
@@ -5,7 +5,6 @@
             <xsl:apply-templates/>
         </provider>
     </xsl:template>
-
     <xsl:template match="auth">
         <xsl:variable name="delegation-protocol" select="//attribute[@name='delegation-protocol']/@value" />
         <xsl:choose>
@@ -13,6 +12,18 @@
                 <xsl:variable name="idp" select="//attribute[@name='shib-identity-provider']/@value" />
                 <idp><xsl:value-of select="$idp"/></idp>
                 <xsl:choose>
+                    <!-- Albion College (ALBION) -->
+                    <xsl:when test="$idp='ethos01w.albion.edu'">
+                        <id>albion</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName/>
+                            <givenName/>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Brown University (BROWN) -->
                     <xsl:when test="$idp='https://sso.brown.edu/idp/shibboleth'">
                         <id>brown</id>
@@ -61,6 +72,8 @@
                             <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
                             <middleNames/>
                             <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='primary-affiliation']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
                         </user>
                     </xsl:when>
                     <!-- Cornell University (CORNELL) -->
@@ -99,6 +112,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Erasmus University Rotterdam (EUR) -->
+                    <xsl:when test="$idp='https://sts.windows.net/715902d6-f63e-4b8d-929b-4bb170bad492/'">
+                        <id>eur</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Ferris State University (FERRIS) -->
                     <xsl:when test="$idp='https://login.ferris.edu/samlsso'">
                         <id>ferristest</id>
@@ -111,7 +136,6 @@
                             <suffix/>
                         </user>
                     </xsl:when>
-
                     <!-- Ferris State University (FERRIS) (Production: remove after testing)-->
                     <xsl:when test="$idp='login.ferris.edu'">
                         <id>ferris</id>
@@ -124,7 +148,6 @@
                             <suffix/>
                         </user>
                     </xsl:when>
-
                     <!--Florida State University (FSU) -->
                     <xsl:when test="$idp='https://idp.fsu.edu'">
                         <id>fsu</id>
@@ -135,6 +158,21 @@
                             <givenName/>
                             <middleNames/>
                             <suffix/>
+                            <userRoles><xsl:value-of select="//attribute[@name='userroles']/@value"/></userRoles>
+                        </user>
+                    </xsl:when>
+                    <!-- Georgia Institute of Technology (GATECH) -->
+                    <xsl:when test="$idp='https://idp.gatech.edu/idp/shibboleth'">
+                        <id>gatech</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <middleNames/>
+                            <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='department']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
                         </user>
                     </xsl:when>
                     <!-- George Mason University (GMU) -->
@@ -149,6 +187,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Harvard University (HARVARD) -->
+                    <xsl:when test="$idp='https://fed.huit.harvard.edu/idp/shibboleth'">
+                        <id>harvard</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- Illinois Institute of Technology (IIT) -->
                     <xsl:when test="$idp='https://login.iit.edu/cas/idp'">
                         <id>iit</id>
@@ -221,6 +271,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Nesta [Test] -->
+                    <xsl:when test="$idp='http://www.okta.com/exkum8f6y1gTYTIaT0x7'">
+                        <id>nesta</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- New York University (NYU) -->
                     <xsl:when test="$idp='https://shibbolethqa.es.its.nyu.edu/idp/shibboleth'">
                         <id>nyu</id>
@@ -233,6 +295,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- OK State University (OKSTATE) -->
+                    <xsl:when test="$idp='https://stwcas.okstate.edu/idp'">
+                        <id>okstate</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- The University of Oklahoma (OU) -->
                     <xsl:when test="$idp='https://shib.ou.edu/idp/shibboleth'">
                         <id>ou</id>
@@ -257,6 +331,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Purdue University (PURDUE) -->
+                    <xsl:when test="$idp='https://idp.purdue.edu/idp/shibboleth'">
+                        <id>purdue</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- University of Arizona (UA) -->
                     <xsl:when test="$idp='urn:mace:incommon:arizona.edu'">
                         <id>ua</id>
@@ -403,6 +489,44 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- University of Maryland, Baltimore (UMB) -->
+                    <xsl:when test="$idp='https://webauth.umaryland.edu/idp/shibboleth'">
+                        <id>umb</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
+                    <!-- University of London (UOL) -->
+                    <xsl:when test="$idp='https://idp.uolia.london.ac.uk/shibboleth'">
+                        <id>uol</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='eppn']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
+                    <!-- University of Manchester (UOM) -->
+                    <xsl:when test="$idp='https://beta.shib.manchester.ac.uk/shibboleth'">
+                        <id>uom</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <middleNames/>
+                            <suffix/>
+                            <isSelectiveSso>true</isSelectiveSso>
+                            <selectiveSsoFilter><xsl:value-of select="//attribute[@name='selectivessofilter']/@value"/></selectiveSsoFilter>
+                        </user>
+                    </xsl:when>
                     <!-- University of Southern California (USC) -->
                     <xsl:when test="$idp='https://shibboleth.usc.edu/shibboleth-idp'">
                         <id>usc</id>
@@ -415,6 +539,18 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- University of South Carolina (SC) [Test] -->
+                    <xsl:when test="$idp='https://cas.auth.sc.edu/cas/idp'">
+                        <id>sc</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
+                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
+                            <fullname/>
+                            <middleNames/>
+                            <suffix/>
+                        </user>
+                    </xsl:when>
                     <!-- The University of Texas at Dallas (UTDALLAS) -->
                     <xsl:when test="$idp='https://idp.utdallas.edu/idp/shibboleth'">
                         <id>utdallas</id>
@@ -475,6 +611,20 @@
                             <suffix/>
                         </user>
                     </xsl:when>
+                    <!-- Vrije Universiteit Amsterdam (VUA) [Test] -->
+                    <xsl:when test="$idp='http://stsfed.test.vu.nl/adfs/services/trust'">
+                        <id>vua</id>
+                        <user>
+                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
+                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <familyName/>
+                            <givenName/>
+                            <middleNames/>
+                            <suffix/>
+                            <departmentRaw><xsl:value-of select="//attribute[@name='department']/@value"/></departmentRaw>
+                            <eduPerson>false</eduPerson>
+                        </user>
+                    </xsl:when>
                     <!-- Unknown Identity Provider -->
                     <xsl:otherwise>
                         <xsl:message terminate="yes">Error: Unknown Identity Provider '<xsl:value-of select="$idp"/>'</xsl:message>
@@ -490,22 +640,11 @@
                         <id>cord</id>
                         <user>
                             <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
-                            <fullname><xsl:value-of select="//attribute[@name='displayname']/@value"/></fullname>
+                            <fullname><xsl:value-of select="//attribute[@name='displayName']/@value"/></fullname>
                             <familyName />
                             <givenName />
-                            <middleNames/>
-                            <suffix/>
-                        </user>
-                    </xsl:when>
-                    <!-- OK State University (OKSTATE) -->
-                    <xsl:when test="$idp='okstate'">
-                        <id>okstate</id>
-                        <user>
-                            <username><xsl:value-of select="//attribute[@name='mail']/@value"/></username>
-                            <familyName><xsl:value-of select="//attribute[@name='sn']/@value"/></familyName>
-                            <givenName><xsl:value-of select="//attribute[@name='givenname']/@value"/></givenName>
-                            <middleNames/>
-                            <suffix/>
+                            <middleNames />
+                            <suffix />
                         </user>
                     </xsl:when>
                     <!-- Unknown Identity Provider -->
diff --git a/etc/cas/config/local/cas-local.properties b/etc/cas/config/local/cas-local.properties
index 64e31ac..c3ed142 100644
--- a/etc/cas/config/local/cas-local.properties
+++ b/etc/cas/config/local/cas-local.properties
@@ -269,15 +269,10 @@ cas.authn.pac4j.cas[0].client-name=cord
 cas.authn.pac4j.cas[0].protocol=SAML
 cas.authn.pac4j.cas[0].callback-url-type=QUERY_PARAMETER
 #
-cas.authn.pac4j.cas[1].login-url=https://stwcas.okstate.edu/cas/login
-cas.authn.pac4j.cas[1].client-name=okstate
-cas.authn.pac4j.cas[1].protocol=SAML
+cas.authn.pac4j.cas[1].login-url=http://192.168.168.167:8081/login
+cas.authn.pac4j.cas[1].client-name=osftype0
+cas.authn.pac4j.cas[1].protocol=CAS30
 cas.authn.pac4j.cas[1].callback-url-type=QUERY_PARAMETER
-#
-cas.authn.pac4j.cas[2].login-url=http://192.168.168.167:8081/login
-cas.authn.pac4j.cas[2].client-name=fakecas
-cas.authn.pac4j.cas[2].protocol=CAS30
-cas.authn.pac4j.cas[2].callback-url-type=QUERY_PARAMETER
 ########################################################################################################################
 
 ########################################################################################################################
diff --git a/etc/cas/services/local/casarxiv-203948234207239.json b/etc/cas/services/local/casarxiv-203948234207239.json
index dbbc71a..cfdebcb 100644
--- a/etc/cas/services/local/casarxiv-203948234207239.json
+++ b/etc/cas/services/local/casarxiv-203948234207239.json
@@ -25,8 +25,7 @@
         "java.util.ArrayList",
         [
           "cord",
-          "fakecas",
-          "okstate",
+          "osftype0",
           "orcid"
         ]
       ],
diff --git a/etc/cas/services/local/osf-203948234207230.json b/etc/cas/services/local/osf-203948234207230.json
index 5ba8cf7..d14b374 100644
--- a/etc/cas/services/local/osf-203948234207230.json
+++ b/etc/cas/services/local/osf-203948234207230.json
@@ -25,8 +25,7 @@
         "java.util.ArrayList",
         [
           "cord",
-          "fakecas",
-          "okstate",
+          "osftype0",
           "orcid"
         ]
       ],
diff --git a/etc/cas/services/local/preprints-203948234207240.json b/etc/cas/services/local/preprints-203948234207240.json
index 5928bc2..f36d602 100644
--- a/etc/cas/services/local/preprints-203948234207240.json
+++ b/etc/cas/services/local/preprints-203948234207240.json
@@ -25,8 +25,7 @@
         "java.util.ArrayList",
         [
           "cord",
-          "fakecas",
-          "okstate",
+          "osftype0",
           "orcid"
         ]
       ],
diff --git a/etc/cas/services/local/registries-203948234207340.json b/etc/cas/services/local/registries-203948234207340.json
index 160d223..deb7ce0 100644
--- a/etc/cas/services/local/registries-203948234207340.json
+++ b/etc/cas/services/local/registries-203948234207340.json
@@ -25,8 +25,7 @@
         "java.util.ArrayList",
         [
           "cord",
-          "fakecas",
-          "okstate",
+          "osftype0",
           "orcid"
         ]
       ],
diff --git a/src/main/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java b/src/main/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java
index c74ca52..a5b973f 100644
--- a/src/main/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java
+++ b/src/main/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java
@@ -106,7 +106,7 @@
  *
  * For 1) only, the success event will trigger authentication with pac4j's authentication handler.
  *
- * 2) In the case of institution pac4j authentication delegation (e.g. OKState and Concordia), if credential with a
+ * 2) In the case of institution pac4j authentication delegation (e.g. Concordia), if credential with a
  * matching client is found, extract the client info, principal ID and authentication attributes and store them into
  * the {@code OsfPostgresCredential#delegationAttributes} object.
  *
diff --git a/src/main/resources/templates/casInstitutionLoginView.html b/src/main/resources/templates/casInstitutionLoginView.html
index 760d63c..51f4756 100644
--- a/src/main/resources/templates/casInstitutionLoginView.html
+++ b/src/main/resources/templates/casInstitutionLoginView.html
@@ -91,11 +91,7 @@ <h1 th:utext="#{screen.institutionlogin.heading}"></h1>
                         submitButton.style.backgroundColor = "#efefef";
                         return;
                     }
-                    if (institutionLoginUrl === "okstate") {
-                        /*<![CDATA[*/
-                            institutionLoginUrl = /*[[${pac4jInstnLoginUrls.get('okstate')}]]*/ '';
-                        /*]]>*/
-                    } else if (institutionLoginUrl === "cord") {
+                    if (institutionLoginUrl === "cord") {
                         /*<![CDATA[*/
                             institutionLoginUrl = /*[[${pac4jInstnLoginUrls.get('cord')}]]*/ '';
                         /*]]>*/