diff --git a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
index 741bd87313..436f2cc75e 100644
--- a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
@@ -123,7 +123,7 @@ rabbitmq_integration_suite(
 )
 
 rabbitmq_integration_suite(
-    name = "rabbit_oauth2_resource_server_SUITE"
+    name = "rabbit_oauth2_resource_server_SUITE",
 )
 
 rabbitmq_integration_suite(
diff --git a/deps/rabbitmq_auth_backend_oauth2/app.bzl b/deps/rabbitmq_auth_backend_oauth2/app.bzl
index a74d5bfe38..93dc81e5ef 100644
--- a/deps/rabbitmq_auth_backend_oauth2/app.bzl
+++ b/deps/rabbitmq_auth_backend_oauth2/app.bzl
@@ -13,10 +13,10 @@ def all_beam_files(name = "all_beam_files"):
             "src/Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand.erl",
             "src/rabbit_auth_backend_oauth2.erl",
             "src/rabbit_auth_backend_oauth2_app.erl",
-            "src/rabbit_oauth2_provider.erl",
-            "src/rabbit_oauth2_resource_server.erl",
-            "src/rabbit_oauth2_rar.erl",
             "src/rabbit_oauth2_keycloak.erl",
+            "src/rabbit_oauth2_provider.erl",
+            "src/rabbit_oauth2_rar.erl",
+            "src/rabbit_oauth2_resource_server.erl",
             "src/rabbit_oauth2_schema.erl",
             "src/rabbit_oauth2_scope.erl",
             "src/uaa_jwks.erl",
@@ -51,11 +51,11 @@ def all_test_beam_files(name = "all_test_beam_files"):
             "src/Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand.erl",
             "src/rabbit_auth_backend_oauth2.erl",
             "src/rabbit_auth_backend_oauth2_app.erl",
-            "src/rabbit_oauth2_resource_server.erl",
-            "src/rabbit_oauth2_provider.erl",
-            "src/rabbit_oauth2_schema.erl",
-            "src/rabbit_oauth2_rar.erl",
             "src/rabbit_oauth2_keycloak.erl",
+            "src/rabbit_oauth2_provider.erl",
+            "src/rabbit_oauth2_rar.erl",
+            "src/rabbit_oauth2_resource_server.erl",
+            "src/rabbit_oauth2_schema.erl",
             "src/rabbit_oauth2_scope.erl",
             "src/uaa_jwks.erl",
             "src/uaa_jwt.erl",
@@ -101,11 +101,11 @@ def all_srcs(name = "all_srcs"):
             "src/Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand.erl",
             "src/rabbit_auth_backend_oauth2.erl",
             "src/rabbit_auth_backend_oauth2_app.erl",
+            "src/rabbit_oauth2_keycloak.erl",
             "src/rabbit_oauth2_provider.erl",
+            "src/rabbit_oauth2_rar.erl",
             "src/rabbit_oauth2_resource_server.erl",
             "src/rabbit_oauth2_schema.erl",
-            "src/rabbit_oauth2_rar.erl",
-            "src/rabbit_oauth2_keycloak.erl",
             "src/rabbit_oauth2_scope.erl",
             "src/uaa_jwks.erl",
             "src/uaa_jwt.erl",
@@ -236,8 +236,10 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         hdrs = ["include/oauth2.hrl"],
         app_name = "rabbitmq_auth_backend_oauth2",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app",
-                "//deps/oauth2_client:erlang_app"],
+        deps = [
+            "//deps/oauth2_client:erlang_app",
+            "//deps/rabbit_common:erlang_app",
+        ],
     )
     erlang_bytecode(
         name = "wildcard_match_SUITE_beam_files",
diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel
index 2d0677b21f..3161275a28 100644
--- a/deps/rabbitmq_management/BUILD.bazel
+++ b/deps/rabbitmq_management/BUILD.bazel
@@ -89,6 +89,7 @@ rabbitmq_app(
         "//deps/rabbitmq_web_dispatch:erlang_app",
         "@cowboy//:erlang_app",
         "@cowlib//:erlang_app",
+        "@cuttlefish//:erlang_app",
         "@ranch//:erlang_app",
     ],
 )
@@ -132,7 +133,7 @@ rabbitmq_suite(
 
 rabbitmq_suite(
     name = "rabbit_mgmt_schema_SUITE",
-    size = "small"    
+    size = "small",
 )
 
 rabbitmq_integration_suite(
diff --git a/deps/rabbitmq_management/app.bzl b/deps/rabbitmq_management/app.bzl
index 4e197d13f2..fbee1f2861 100644
--- a/deps/rabbitmq_management/app.bzl
+++ b/deps/rabbitmq_management/app.bzl
@@ -30,9 +30,9 @@ def all_beam_files(name = "all_beam_files"):
             "src/rabbit_mgmt_load_definitions.erl",
             "src/rabbit_mgmt_login.erl",
             "src/rabbit_mgmt_nodes.erl",
-            "src/rabbit_mgmt_schema.erl",
             "src/rabbit_mgmt_oauth_bootstrap.erl",
             "src/rabbit_mgmt_reset_handler.erl",
+            "src/rabbit_mgmt_schema.erl",
             "src/rabbit_mgmt_stats.erl",
             "src/rabbit_mgmt_sup.erl",
             "src/rabbit_mgmt_sup_sup.erl",
@@ -164,9 +164,9 @@ def all_test_beam_files(name = "all_test_beam_files"):
             "src/rabbit_mgmt_load_definitions.erl",
             "src/rabbit_mgmt_login.erl",
             "src/rabbit_mgmt_nodes.erl",
-            "src/rabbit_mgmt_schema.erl",
             "src/rabbit_mgmt_oauth_bootstrap.erl",
             "src/rabbit_mgmt_reset_handler.erl",
+            "src/rabbit_mgmt_schema.erl",
             "src/rabbit_mgmt_stats.erl",
             "src/rabbit_mgmt_sup.erl",
             "src/rabbit_mgmt_sup_sup.erl",
@@ -389,9 +389,9 @@ def all_srcs(name = "all_srcs"):
             "src/rabbit_mgmt_load_definitions.erl",
             "src/rabbit_mgmt_login.erl",
             "src/rabbit_mgmt_nodes.erl",
-            "src/rabbit_mgmt_schema.erl",
             "src/rabbit_mgmt_oauth_bootstrap.erl",
             "src/rabbit_mgmt_reset_handler.erl",
+            "src/rabbit_mgmt_schema.erl",
             "src/rabbit_mgmt_stats.erl",
             "src/rabbit_mgmt_sup.erl",
             "src/rabbit_mgmt_sup_sup.erl",
@@ -505,7 +505,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/rabbit_mgmt_schema_SUITE.beam"],
         app_name = "rabbitmq_management",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["@proper//:erlang_app"],
     )
     erlang_bytecode(
         name = "cache_SUITE_beam_files",
diff --git a/moduleindex.yaml b/moduleindex.yaml
index 08b3bdc8d0..cbcc44019c 100755
--- a/moduleindex.yaml
+++ b/moduleindex.yaml
@@ -836,7 +836,10 @@ rabbitmq_auth_backend_oauth2:
 - Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand
 - rabbit_auth_backend_oauth2
 - rabbit_auth_backend_oauth2_app
-- rabbit_oauth2_config
+- rabbit_oauth2_keycloak
+- rabbit_oauth2_provider
+- rabbit_oauth2_rar
+- rabbit_oauth2_resource_server
 - rabbit_oauth2_schema
 - rabbit_oauth2_scope
 - uaa_jwks
@@ -927,6 +930,7 @@ rabbitmq_management:
 - rabbit_mgmt_nodes
 - rabbit_mgmt_oauth_bootstrap
 - rabbit_mgmt_reset_handler
+- rabbit_mgmt_schema
 - rabbit_mgmt_stats
 - rabbit_mgmt_sup
 - rabbit_mgmt_sup_sup