diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
index eaf4cf5e606b..59959eaf8926 100644
--- a/deps/rabbit/app.bzl
+++ b/deps/rabbit/app.bzl
@@ -2087,15 +2087,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
     )
-    erlang_bytecode(
-        name = "amqp_system_SUITE_beam_files",
-        testonly = True,
-        srcs = ["test/amqp_system_SUITE.erl"],
-        outs = ["test/amqp_system_SUITE.beam"],
-        app_name = "rabbit",
-        erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
-    )
+
     erlang_bytecode(
         name = "amqp_address_SUITE_beam_files",
         testonly = True,
@@ -2220,3 +2212,21 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
     )
+    erlang_bytecode(
+        name = "amqp_dotnet_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/amqp_dotnet_SUITE.erl"],
+        outs = ["test/amqp_dotnet_SUITE.beam"],
+        app_name = "rabbit",
+        erlc_opts = "//:test_erlc_opts",
+        deps = ["//deps/rabbit_common:erlang_app"],
+    )
+    erlang_bytecode(
+        name = "amqp_jms_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/amqp_jms_SUITE.erl"],
+        outs = ["test/amqp_jms_SUITE.beam"],
+        app_name = "rabbit",
+        erlc_opts = "//:test_erlc_opts",
+        deps = ["//deps/amqp10_common:erlang_app"],
+    )
diff --git a/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel b/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
index 92ecfe008ade..8e6347dcdc9a 100644
--- a/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
+++ b/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
@@ -42,11 +42,7 @@ rabbitmq_app(
     beam_files = [":beam_files"],
     license_files = [":license_files"],
     priv = [":priv"],
-    deps = [
-        "//deps/rabbit:erlang_app",
-        "//deps/rabbit_common:erlang_app",
-        "//deps/rabbitmq_peer_discovery_common:erlang_app",
-    ],
+    deps = ["//deps/rabbit_common:erlang_app"],
 )
 
 xref(
diff --git a/deps/rabbitmq_peer_discovery_k8s/app.bzl b/deps/rabbitmq_peer_discovery_k8s/app.bzl
index 30256fea81ab..a067ad256f4f 100644
--- a/deps/rabbitmq_peer_discovery_k8s/app.bzl
+++ b/deps/rabbitmq_peer_discovery_k8s/app.bzl
@@ -16,10 +16,7 @@ def all_beam_files(name = "all_beam_files"):
         app_name = "rabbitmq_peer_discovery_k8s",
         dest = "ebin",
         erlc_opts = "//:erlc_opts",
-        deps = [
-            "//deps/rabbit_common:erlang_app",
-            "//deps/rabbitmq_peer_discovery_common:erlang_app",
-        ],
+        deps = ["//deps/rabbit_common:erlang_app"],
     )
 
 def all_test_beam_files(name = "all_test_beam_files"):
@@ -39,10 +36,7 @@ def all_test_beam_files(name = "all_test_beam_files"):
         app_name = "rabbitmq_peer_discovery_k8s",
         dest = "test",
         erlc_opts = "//:test_erlc_opts",
-        deps = [
-            "//deps/rabbit_common:erlang_app",
-            "//deps/rabbitmq_peer_discovery_common:erlang_app",
-        ],
+        deps = ["//deps/rabbit_common:erlang_app"],
     )
 
 def all_srcs(name = "all_srcs"):
@@ -71,7 +65,6 @@ def all_srcs(name = "all_srcs"):
     )
     filegroup(
         name = "public_hdrs",
-        srcs = ["include/rabbit_peer_discovery_k8s.hrl"],
     )
     filegroup(
         name = "license_files",
diff --git a/moduleindex.yaml b/moduleindex.yaml
index 83d6e4ae3829..5f3924d17033 100755
--- a/moduleindex.yaml
+++ b/moduleindex.yaml
@@ -1087,9 +1087,6 @@ rabbitmq_peer_discovery_etcd:
 rabbitmq_peer_discovery_k8s:
 - rabbit_peer_discovery_k8s
 - rabbitmq_peer_discovery_k8s
-- rabbitmq_peer_discovery_k8s_app
-- rabbitmq_peer_discovery_k8s_node_monitor
-- rabbitmq_peer_discovery_k8s_sup
 rabbitmq_prelaunch:
 - rabbit_boot_state
 - rabbit_boot_state_sup