diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/src/main/java/org/xwiki/wiki/template/WikiTemplateManager.java b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/src/main/java/org/xwiki/wiki/template/WikiTemplateManager.java
index 7dda9f2d46cdec4005fe7ccdd1b90454ca0a7dc2..8de8adb990d946cac01106c40c8f2d5df6b87cbe 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/src/main/java/org/xwiki/wiki/template/WikiTemplateManager.java
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/src/main/java/org/xwiki/wiki/template/WikiTemplateManager.java
@@ -23,7 +23,6 @@
 import java.util.List;
 
 import org.xwiki.component.annotation.Role;
-import org.xwiki.stability.Unstable;
 import org.xwiki.wiki.descriptor.WikiDescriptor;
 import org.xwiki.wiki.provisioning.WikiProvisioningJob;
 
@@ -34,7 +33,6 @@
  * @since 5.3M2
  */
 @Role
-@Unstable
 public interface WikiTemplateManager
 {
     /**
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/MembershipType.java b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/MembershipType.java
index 68250e9422f2987db768a8129cd0e29e1b3e0277..12adc83be9c41c4fbb0cb2d765e71be4d4f3c868 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/MembershipType.java
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/MembershipType.java
@@ -19,15 +19,12 @@
  */
 package org.xwiki.wiki.user;
 
-import org.xwiki.stability.Unstable;
-
 /**
  * Used to specify how user can become member of a wiki.
  *
  * @since 5.3M2
  * @version $Id$
  */
-@Unstable
 public enum MembershipType
 {
     /**
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/UserScope.java b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/UserScope.java
index c63d99b7d93e211a5b7403368cb56f88dd3b1373..60048edfcde84f0af9d147eafdd1654546529d41 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/UserScope.java
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/UserScope.java
@@ -19,15 +19,12 @@
  */
 package org.xwiki.wiki.user;
 
-import org.xwiki.stability.Unstable;
-
 /**
  * Used to specify what kind of users are enabled on a wiki.
  *
  * @since 5.3M2
  * @version $Id$
  */
-@Unstable
 public enum UserScope
 {
     /**
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/WikiUserManager.java b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/WikiUserManager.java
index d684f12b3a7675e6a10ee3948d21a5b67fb9c7b3..69dd1333be8341397f4cbde65833722f1c338de2 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/WikiUserManager.java
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/src/main/java/org/xwiki/wiki/user/WikiUserManager.java
@@ -23,7 +23,6 @@
 
 import org.xwiki.component.annotation.Role;
 import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.stability.Unstable;
 
 /**
  * Component that manage how users can participate on a wiki (local users, members, invitation, etc...).
@@ -32,7 +31,6 @@
  * @version $Id$
  */
 @Role
-@Unstable
 public interface WikiUserManager
 {
     /**