diff --git a/templates/accountProfiles/alumni1.tt2 b/templates/accountProfiles/alumni1.tt2
index dd556545ae3a9ad0d279e5c40a50b4d1e1e54966..eba7e280e3f2ad888caf25020817c456efab1b62 100644
--- a/templates/accountProfiles/alumni1.tt2
+++ b/templates/accountProfiles/alumni1.tt2
@@ -13,6 +13,6 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 } %]
 
diff --git a/templates/accountProfiles/employee1.tt2 b/templates/accountProfiles/employee1.tt2
index e2dfa9e3eaa244012d9a81a4e9af17ae29f1912e..cc0628d84d45b4db213270af57e90ad88d52cb53 100644
--- a/templates/accountProfiles/employee1.tt2
+++ b/templates/accountProfiles/employee1.tt2
@@ -13,6 +13,6 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 } %]
 
diff --git a/templates/accountProfiles/librarywalkin1.tt2 b/templates/accountProfiles/librarywalkin1.tt2
index 9407e74aac03c6e4002aad28e2d3251a97c4dbb1..c2c721e16dad966320168316ebac4ba47fd8d051 100644
--- a/templates/accountProfiles/librarywalkin1.tt2
+++ b/templates/accountProfiles/librarywalkin1.tt2
@@ -13,7 +13,7 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 	'eduPersonEntitlement' => 'urn:mace:dir:entitlement:common-lib-terms',
 } %]
 
diff --git a/templates/accountProfiles/researcher1.tt2 b/templates/accountProfiles/researcher1.tt2
index 6b2c2eeb1e8fc9d097488d75709cf5160202636e..c12800cf4e94cc77ef5a9cc8abab21ce138e1cd7 100644
--- a/templates/accountProfiles/researcher1.tt2
+++ b/templates/accountProfiles/researcher1.tt2
@@ -13,7 +13,7 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:public-research-institution',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 } %]
 
 
diff --git a/templates/accountProfiles/student1.tt2 b/templates/accountProfiles/student1.tt2
index ffd2b0de4e451bb398f94b7017918913d7c34d0f..cf4dd8be29f2d2155f71db465c93dcab2758261b 100644
--- a/templates/accountProfiles/student1.tt2
+++ b/templates/accountProfiles/student1.tt2
@@ -13,6 +13,6 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 } %]
 
diff --git a/templates/accountProfiles/student2.tt2 b/templates/accountProfiles/student2.tt2
index fe96661f65497eadc02fd8bd7625ee4b878d3ac3..a9f9a45cb5382118f5b9714833b67428658ee4ce 100644
--- a/templates/accountProfiles/student2.tt2
+++ b/templates/accountProfiles/student2.tt2
@@ -13,6 +13,6 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 } %]
 
diff --git a/templates/accountProfiles/teacher1.tt2 b/templates/accountProfiles/teacher1.tt2
index 6e5e6a1cbd9d44b2f558c7b66a131adbeb81ee5f..9719a8627d081f6c9bbe419cd4a9647f5b324d22 100644
--- a/templates/accountProfiles/teacher1.tt2
+++ b/templates/accountProfiles/teacher1.tt2
@@ -13,7 +13,7 @@
         'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
         'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
         'schacHomeOrganization' => "${conf.idp_scope}",
-        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:other',
 } %]