diff --git a/mysql-test/suite/s3/my.cnf b/mysql-test/suite/s3/my.cnf
index 487aa65230f..f851aa18d6d 100644
--- a/mysql-test/suite/s3/my.cnf
+++ b/mysql-test/suite/s3/my.cnf
@@ -2,7 +2,6 @@
 !include include/default_client.cnf
 
 [mysqld.1]
-plugin-maturity = gamma
 plugin-load-add=@ENV.HA_S3_SO
 s3=ON
 s3-host-name=@ENV.S3_HOST_NAME
diff --git a/mysql-test/suite/s3/slave.cnf b/mysql-test/suite/s3/slave.cnf
index 28dc8572b30..4f4d3d39ac7 100644
--- a/mysql-test/suite/s3/slave.cnf
+++ b/mysql-test/suite/s3/slave.cnf
@@ -1,5 +1,4 @@
 [mysqld.2]
-plugin-maturity = gamma
 plugin-load-add=@ENV.HA_S3_SO
 s3=ON
 s3-slave-ignore-updates=1
diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result
index a51d0f0dd39..200ab30768f 100644
--- a/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result
+++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result
@@ -24,7 +24,7 @@ PLUGIN_TYPE	DATA TYPE
 PLUGIN_AUTHOR	MariaDB Corporation
 PLUGIN_DESCRIPTION	Data type INET6
 PLUGIN_LICENSE	GPL
-PLUGIN_MATURITY	Gamma
+PLUGIN_MATURITY	Stable
 PLUGIN_AUTH_VERSION	1.0
 #
 # End of 10.5 tests
diff --git a/plugin/type_inet/plugin.cc b/plugin/type_inet/plugin.cc
index 2baa98f0594..77804c82af6 100644
--- a/plugin/type_inet/plugin.cc
+++ b/plugin/type_inet/plugin.cc
@@ -186,7 +186,7 @@ maria_declare_plugin(type_inet)
   NULL,                         // Status variables
   NULL,                         // System variables
   "1.0",                        // String version representation
-  MariaDB_PLUGIN_MATURITY_GAMMA // Maturity(see include/mysql/plugin.h)*/
+  MariaDB_PLUGIN_MATURITY_STABLE// Maturity(see include/mysql/plugin.h)*/
 },
 {
   MariaDB_FUNCTION_PLUGIN,      // the plugin type (see include/mysql/plugin.h)
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc
index b27afc2fcf7..9a0a458bfe5 100644
--- a/storage/maria/ha_s3.cc
+++ b/storage/maria/ha_s3.cc
@@ -1111,6 +1111,6 @@ maria_declare_plugin(s3)
   status_variables,             /* status variables */
   system_variables,             /* system variables */
   "1.0",                        /* string version   */
-  MariaDB_PLUGIN_MATURITY_GAMMA /* maturity         */
+  MariaDB_PLUGIN_MATURITY_STABLE/* maturity         */
 }
 maria_declare_plugin_end;