diff --git a/obp-api/src/main/scala/code/api/util/ApiTag.scala b/obp-api/src/main/scala/code/api/util/ApiTag.scala
index 864efed1a..f1d4cdb92 100644
--- a/obp-api/src/main/scala/code/api/util/ApiTag.scala
+++ b/obp-api/src/main/scala/code/api/util/ApiTag.scala
@@ -45,7 +45,9 @@ object ApiTag {
   val apiTagCustomer = ResourceDocTag("Customer")
   val apiTagOnboarding = ResourceDocTag("Onboarding")
   val apiTagUser = ResourceDocTag("User") // Use for User Management / Info APIs
-  val apiTagUserInvitation = ResourceDocTag("User-Invitation") 
+  val apiTagUserInvitation = ResourceDocTag("User-Invitation")
+  val apiTagAttribute = ResourceDocTag("Attribute")
+  val apiTagUserAttribute = ResourceDocTag("User-Attribute")
   val apiTagMeeting = ResourceDocTag("Customer-Meeting")
   val apiTagExperimental = ResourceDocTag("Experimental")
   val apiTagPerson = ResourceDocTag("Person")
diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
index dd396ddc7..5485d87d5 100644
--- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
+++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
@@ -4608,7 +4608,7 @@ trait APIMethods600 {
         InvalidJsonFormat,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List(canCreateUserAttribute))
     )
 
@@ -4665,7 +4665,7 @@ trait APIMethods600 {
         UserNotFoundByUserId,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List(canGetUserAttributes))
     )
 
@@ -4703,7 +4703,7 @@ trait APIMethods600 {
         UserAttributeNotFound,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List(canGetUserAttributes))
     )
 
@@ -4751,7 +4751,7 @@ trait APIMethods600 {
         InvalidJsonFormat,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List(canUpdateUserAttribute))
     )
 
@@ -4811,7 +4811,7 @@ trait APIMethods600 {
         UserAttributeNotFound,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List(canDeleteUserAttribute))
     )
 
@@ -4873,7 +4873,7 @@ trait APIMethods600 {
         InvalidJsonFormat,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List())
     )
 
@@ -4926,7 +4926,7 @@ trait APIMethods600 {
         $UserNotLoggedIn,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List())
     )
 
@@ -4960,7 +4960,7 @@ trait APIMethods600 {
         UserAttributeNotFound,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List())
     )
 
@@ -5004,7 +5004,7 @@ trait APIMethods600 {
         InvalidJsonFormat,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List())
     )
 
@@ -5060,7 +5060,7 @@ trait APIMethods600 {
         UserAttributeNotFound,
         UnknownError
       ),
-      List(apiTagUser),
+      List(apiTagUser, apiTagUserAttribute, apiTagAttribute),
       Some(List())
     )