diff --git a/vertx-core/src/main/java/io/vertx/core/file/AsyncFile.java b/vertx-core/src/main/java/io/vertx/core/file/AsyncFile.java
index 10ce96bc121..866a8b9aff4 100644
--- a/vertx-core/src/main/java/io/vertx/core/file/AsyncFile.java
+++ b/vertx-core/src/main/java/io/vertx/core/file/AsyncFile.java
@@ -13,7 +13,6 @@
 
 import io.vertx.codegen.annotations.Fluent;
 import io.vertx.codegen.annotations.Nullable;
-import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
@@ -174,7 +173,6 @@ public interface AsyncFile extends ReadStream<Buffer>, WriteStream<Buffer> {
    *
    * @return the lock if it can be acquired immediately, otherwise {@code null}
    */
-  @Unstable
   default @Nullable AsyncFileLock tryLock() {
     return tryLock(0, Long.MAX_VALUE, false);
   }
@@ -187,7 +185,6 @@ public interface AsyncFile extends ReadStream<Buffer>, WriteStream<Buffer> {
    * @param shared whether the lock should be shared
    * @return the lock if it can be acquired immediately, otherwise {@code null}
    */
-  @Unstable
   @Nullable AsyncFileLock tryLock(long position, long size, boolean shared);
 
   /**
@@ -195,7 +192,6 @@ public interface AsyncFile extends ReadStream<Buffer>, WriteStream<Buffer> {
    *
    * @return a future indicating the completion of this operation
    */
-  @Unstable
   default Future<AsyncFileLock> lock() {
     return lock(0, Long.MAX_VALUE, false);
   }
@@ -208,7 +204,6 @@ default Future<AsyncFileLock> lock() {
    * @param shared whether the lock should be shared
    * @return a future indicating the completion of this operation
    */
-  @Unstable
   Future<AsyncFileLock> lock(long position, long size, boolean shared);
 
   /**
@@ -222,7 +217,6 @@ default Future<AsyncFileLock> lock() {
    * @param block the code block called after lock acquisition
    * @return the future returned by the {@code block}
    */
-  @Unstable
   default <T> Future<T> withLock(Supplier<Future<T>> block) {
     return withLock(0, Long.MAX_VALUE, false, block);
   }
@@ -241,7 +235,6 @@ default <T> Future<T> withLock(Supplier<Future<T>> block) {
    * @param block the code block called after lock acquisition
    * @return the future returned by the {@code block}
    */
-  @Unstable
   default <T> Future<T> withLock(long position, long size, boolean shared, Supplier<Future<T>> block) {
     return lock(position, size, shared)
       .compose(lock -> {
diff --git a/vertx-core/src/main/java/io/vertx/core/http/HttpClientConnection.java b/vertx-core/src/main/java/io/vertx/core/http/HttpClientConnection.java
index fbe0c03974c..7707a7dbbd5 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/HttpClientConnection.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/HttpClientConnection.java
@@ -10,6 +10,7 @@
  */
 package io.vertx.core.http;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.Future;
 
@@ -25,6 +26,7 @@
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 @VertxGen
 public interface HttpClientConnection extends HttpConnection, HttpClient {
 
diff --git a/vertx-core/src/main/java/io/vertx/core/http/HttpServerOptions.java b/vertx-core/src/main/java/io/vertx/core/http/HttpServerOptions.java
index 69d063e0ebb..0ec62656fec 100755
--- a/vertx-core/src/main/java/io/vertx/core/http/HttpServerOptions.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/HttpServerOptions.java
@@ -15,7 +15,6 @@
 import io.netty.handler.logging.ByteBufFormat;
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
-import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.Handler;
 import io.vertx.core.buffer.Buffer;
@@ -591,7 +590,6 @@ public HttpServerOptions setCompressionLevel(int compressionLevel) {
   /**
    * @return the list of compressor to use
    */
-  @Unstable
   public List<CompressionOptions> getCompressors() {
     return compressors;
   }
@@ -602,7 +600,6 @@ public List<CompressionOptions> getCompressors() {
    * @see #setCompressors(List)
    * @return a reference to this, so the API can be used fluently
    */
-  @Unstable
   public HttpServerOptions addCompressor(CompressionOptions compressor) {
     if (compressors == null) {
       compressors = new ArrayList<>();
@@ -619,7 +616,6 @@ public HttpServerOptions addCompressor(CompressionOptions compressor) {
    * @param compressors the list of compressors
    * @return a reference to this, so the API can be used fluently
    */
-  @Unstable
   public HttpServerOptions setCompressors(List<CompressionOptions> compressors) {
     this.compressors = compressors;
     return this;
diff --git a/vertx-core/src/main/java/io/vertx/core/net/AddressResolver.java b/vertx-core/src/main/java/io/vertx/core/net/AddressResolver.java
index 475c2f2b310..0d79c5aa532 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/AddressResolver.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/AddressResolver.java
@@ -10,6 +10,7 @@
  */
 package io.vertx.core.net;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.core.Vertx;
 import io.vertx.core.net.impl.MappingResolver;
 import io.vertx.core.spi.endpoint.EndpointResolver;
@@ -20,6 +21,7 @@
 /**
  * A provider for address resolver.
  */
+@Unstable
 public interface AddressResolver {
 
   /**
diff --git a/vertx-core/src/main/java/io/vertx/core/net/NetworkOptions.java b/vertx-core/src/main/java/io/vertx/core/net/NetworkOptions.java
index 855db3412f6..61296101f16 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/NetworkOptions.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/NetworkOptions.java
@@ -12,7 +12,6 @@
 package io.vertx.core.net;
 
 import io.vertx.codegen.annotations.DataObject;
-import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.impl.Arguments;
 import io.vertx.core.json.JsonObject;
@@ -206,7 +205,6 @@ public boolean getLogActivity() {
   /**
    * @return Netty's logging handler's data format.
    */
-  @Unstable
   public ByteBufFormat getActivityLogDataFormat() {
     return activityLogDataFormat;
   }
@@ -228,7 +226,6 @@ public NetworkOptions setLogActivity(boolean logActivity) {
    * @param activityLogDataFormat the format to use
    * @return a reference to this, so the API can be used fluently
    */
-  @Unstable
   public NetworkOptions setActivityLogDataFormat(ByteBufFormat activityLogDataFormat) {
     this.activityLogDataFormat = activityLogDataFormat;
     return this;
diff --git a/vertx-core/src/main/java/io/vertx/core/net/TrafficShapingOptions.java b/vertx-core/src/main/java/io/vertx/core/net/TrafficShapingOptions.java
index 0ceb21f3c4f..e84af6c589b 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/TrafficShapingOptions.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/TrafficShapingOptions.java
@@ -16,14 +16,12 @@
 
 import io.netty.util.internal.ObjectUtil;
 import io.vertx.codegen.annotations.DataObject;
-import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options describing how {@link io.netty.handler.traffic.GlobalTrafficShapingHandler} will handle traffic shaping.
  */
-@Unstable
 @DataObject
 @JsonGen(publicConverter = false)
 public class TrafficShapingOptions {
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/Endpoint.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/Endpoint.java
index 46cd3fcd1bd..dc281a51bc8 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/Endpoint.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/Endpoint.java
@@ -10,10 +10,12 @@
  */
 package io.vertx.core.net.endpoint;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.annotations.VertxGen;
 
 import java.util.List;
 
+@Unstable
 @VertxGen
 public interface Endpoint {
 
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/EndpointResolver.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/EndpointResolver.java
index 05d82c0f82c..0e3e5f6ebb7 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/EndpointResolver.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/EndpointResolver.java
@@ -10,6 +10,7 @@
  */
 package io.vertx.core.net.endpoint;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.Future;
 import io.vertx.core.net.Address;
@@ -19,6 +20,7 @@
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 @VertxGen
 public interface EndpointResolver {
 
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/InteractionMetrics.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/InteractionMetrics.java
index 7f1725f2133..85164bab1fb 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/InteractionMetrics.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/InteractionMetrics.java
@@ -10,12 +10,15 @@
  */
 package io.vertx.core.net.endpoint;
 
+import io.vertx.codegen.annotations.Unstable;
+
 /**
  * Gather metrics for a request/response interaction with the server, this interface is write-only and used to report
  * usage to build statistics for a load balancing purpose.
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 public interface InteractionMetrics<M> {
 
   InteractionMetrics<?> INSTANCE = new InteractionMetrics<>() {
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/LoadBalancer.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/LoadBalancer.java
index de95a4e000e..9cf21f5e2ea 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/LoadBalancer.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/LoadBalancer.java
@@ -10,6 +10,7 @@
  */
 package io.vertx.core.net.endpoint;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.core.net.endpoint.impl.ConsistentHashingSelector;
 import io.vertx.core.net.endpoint.impl.NoMetricsLoadBalancer;
 
@@ -25,6 +26,7 @@
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 public interface LoadBalancer {
 
   /**
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerEndpoint.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerEndpoint.java
index 896ec607800..3d4ca258e1d 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerEndpoint.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerEndpoint.java
@@ -11,6 +11,7 @@
 package io.vertx.core.net.endpoint;
 
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.net.SocketAddress;
 
@@ -19,6 +20,7 @@
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 @VertxGen
 public interface ServerEndpoint {
 
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerInteraction.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerInteraction.java
index 9d4c1c3e837..e47c348366e 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerInteraction.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerInteraction.java
@@ -10,6 +10,7 @@
  */
 package io.vertx.core.net.endpoint;
 
+import io.vertx.codegen.annotations.Unstable;
 import io.vertx.codegen.annotations.VertxGen;
 
 /**
@@ -17,6 +18,7 @@
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 @VertxGen
 public interface ServerInteraction {
 
diff --git a/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerSelector.java b/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerSelector.java
index bd8546d877a..3cf7adfc073 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerSelector.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/endpoint/ServerSelector.java
@@ -10,11 +10,14 @@
  */
 package io.vertx.core.net.endpoint;
 
+import io.vertx.codegen.annotations.Unstable;
+
 /**
  * Select the most appropriate server among the list of servers of an endpoint.
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
+@Unstable
 public interface ServerSelector {
 
   /**