diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile
index a0d3d2dc2d43..560d96b415a3 100644
--- a/deps/amqp10_client/Makefile
+++ b/deps/amqp10_client/Makefile
@@ -45,10 +45,11 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \
 DEP_PLUGINS += elvis_mk
 dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master
 
-include ../../rabbitmq-components.mk
-include ../../erlang.mk
+include rabbitmq-components.mk
+include erlang.mk
 
-HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
+HEX_TARBALL_FILES += rabbitmq-components.mk \
+		     git-revisions.txt
 
 # --------------------------------------------------------------------
 # Compiler flags.
diff --git a/deps/amqp10_client/erlang.mk b/deps/amqp10_client/erlang.mk
new file mode 120000
index 000000000000..59af4a527a9d
--- /dev/null
+++ b/deps/amqp10_client/erlang.mk
@@ -0,0 +1 @@
+../../erlang.mk
\ No newline at end of file
diff --git a/deps/amqp10_client/rabbitmq-components.mk b/deps/amqp10_client/rabbitmq-components.mk
new file mode 120000
index 000000000000..43c0d3567154
--- /dev/null
+++ b/deps/amqp10_client/rabbitmq-components.mk
@@ -0,0 +1 @@
+../../rabbitmq-components.mk
\ No newline at end of file
diff --git a/deps/amqp10_common/Makefile b/deps/amqp10_common/Makefile
index 9be169537223..ebf41ef29d23 100644
--- a/deps/amqp10_common/Makefile
+++ b/deps/amqp10_common/Makefile
@@ -44,9 +44,10 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-test.mk \
 	      rabbit_common/mk/rabbitmq-tools.mk
 
-include ../../rabbitmq-components.mk
-include ../../erlang.mk
+include rabbitmq-components.mk
+include erlang.mk
 
-HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
+HEX_TARBALL_FILES += rabbitmq-components.mk \
+		     git-revisions.txt
 
 -include development.post.mk
diff --git a/deps/amqp10_common/erlang.mk b/deps/amqp10_common/erlang.mk
new file mode 120000
index 000000000000..59af4a527a9d
--- /dev/null
+++ b/deps/amqp10_common/erlang.mk
@@ -0,0 +1 @@
+../../erlang.mk
\ No newline at end of file
diff --git a/deps/amqp10_common/rabbitmq-components.mk b/deps/amqp10_common/rabbitmq-components.mk
new file mode 120000
index 000000000000..43c0d3567154
--- /dev/null
+++ b/deps/amqp10_common/rabbitmq-components.mk
@@ -0,0 +1 @@
+../../rabbitmq-components.mk
\ No newline at end of file
diff --git a/deps/amqp_client/Makefile b/deps/amqp_client/Makefile
index 7a5f11e4e2de..07f4c758a2fd 100644
--- a/deps/amqp_client/Makefile
+++ b/deps/amqp_client/Makefile
@@ -53,7 +53,8 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 
 PLT_APPS = ssl public_key
 
-include ../../rabbitmq-components.mk
-include ../../erlang.mk
+include rabbitmq-components.mk
+include erlang.mk
 
-HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
+HEX_TARBALL_FILES += rabbitmq-components.mk \
+		     git-revisions.txt
diff --git a/deps/amqp_client/erlang.mk b/deps/amqp_client/erlang.mk
new file mode 120000
index 000000000000..59af4a527a9d
--- /dev/null
+++ b/deps/amqp_client/erlang.mk
@@ -0,0 +1 @@
+../../erlang.mk
\ No newline at end of file
diff --git a/deps/amqp_client/rabbitmq-components.mk b/deps/amqp_client/rabbitmq-components.mk
new file mode 120000
index 000000000000..43c0d3567154
--- /dev/null
+++ b/deps/amqp_client/rabbitmq-components.mk
@@ -0,0 +1 @@
+../../rabbitmq-components.mk
\ No newline at end of file
diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile
index ec516eeb25b4..82aa1111e84a 100644
--- a/deps/rabbit_common/Makefile
+++ b/deps/rabbit_common/Makefile
@@ -6,7 +6,7 @@ define PROJECT_APP_EXTRA_KEYS
 	{licenses, ["MPL-2.0"]},
 	{links, [
 	    {"Website", "https://www.rabbitmq.com/"},
-	    {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/master/deps/rabbit_common"}
+	    {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbit_common"}
 	  ]},
 	{build_tools, ["make", "rebar3"]},
 	{files, [
@@ -20,7 +20,7 @@ define HEX_TARBALL_EXTRA_METADATA
 	licenses => [<<"MPL-2.0">>],
 	links => #{
 		<<"Website">> => <<"https://www.rabbitmq.com">>,
-		<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/tree/master/deps/rabbit_common">>
+		<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbit_common">>
 	}
 }
 endef
@@ -49,9 +49,17 @@ DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \
 
 PLT_APPS += mnesia crypto ssl
 
-include ../../rabbitmq-components.mk
-include ../../erlang.mk
+include rabbitmq-components.mk
+include erlang.mk
 
-HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
+HEX_TARBALL_FILES += rabbitmq-components.mk \
+		     git-revisions.txt \
+		     mk/rabbitmq-build.mk \
+		     mk/rabbitmq-dist.mk \
+		     mk/rabbitmq-early-test.mk \
+		     mk/rabbitmq-hexpm.mk \
+		     mk/rabbitmq-macros.mk \
+		     mk/rabbitmq-test.mk \
+		     mk/rabbitmq-tools.mk
 
 -include development.post.mk
diff --git a/deps/rabbit_common/erlang.mk b/deps/rabbit_common/erlang.mk
new file mode 120000
index 000000000000..59af4a527a9d
--- /dev/null
+++ b/deps/rabbit_common/erlang.mk
@@ -0,0 +1 @@
+../../erlang.mk
\ No newline at end of file
diff --git a/deps/rabbit_common/rabbitmq-components.mk b/deps/rabbit_common/rabbitmq-components.mk
new file mode 120000
index 000000000000..43c0d3567154
--- /dev/null
+++ b/deps/rabbit_common/rabbitmq-components.mk
@@ -0,0 +1 @@
+../../rabbitmq-components.mk
\ No newline at end of file
diff --git a/deps/rabbitmq_auth_backend_cache/README.md b/deps/rabbitmq_auth_backend_cache/README.md
index dc3ee7ce5d64..4043f3682974 100644
--- a/deps/rabbitmq_auth_backend_cache/README.md
+++ b/deps/rabbitmq_auth_backend_cache/README.md
@@ -95,7 +95,7 @@ In the classic config format:
 ].
 ```
 
-The following example combines this backend with the [HTTP backend](https://github.com/rabbitmq/rabbitmq-auth-backend-http/tree/master) and its [example Spring Boot application](https://github.com/rabbitmq/rabbitmq-auth-backend-http/tree/master/examples):
+The following example combines this backend with the [HTTP backend](https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_auth_backend_http) and its [example Spring Boot application](https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_auth_backend_http/examples):
 
 
     auth_backends.1 = cache
diff --git a/deps/rabbitmq_peer_discovery_k8s/README.md b/deps/rabbitmq_peer_discovery_k8s/README.md
index faaad4591dca..2a03b3a2ac58 100644
--- a/deps/rabbitmq_peer_discovery_k8s/README.md
+++ b/deps/rabbitmq_peer_discovery_k8s/README.md
@@ -15,7 +15,7 @@ are not in scope for this plugin.
 For a more comprehensive open source RabbitMQ on Kubernetes deployment solution,
 see the [RabbitMQ Cluster Operator for Kubernetes](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html).
 The Operator is developed [on GitHub](https://github.com/rabbitmq/cluster-operator/) and contains its
-own [set of examples](https://github.com/rabbitmq/cluster-operator/tree/master/docs/examples).
+own [set of examples](https://github.com/rabbitmq/cluster-operator/tree/main/docs/examples).
 
 
 ## Supported RabbitMQ Versions
diff --git a/deps/rabbitmq_peer_discovery_k8s/examples/gke/README.md b/deps/rabbitmq_peer_discovery_k8s/examples/gke/README.md
index 8523780755cf..ccd532929c02 100644
--- a/deps/rabbitmq_peer_discovery_k8s/examples/gke/README.md
+++ b/deps/rabbitmq_peer_discovery_k8s/examples/gke/README.md
@@ -1,3 +1 @@
-# Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to GKE
-
-This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/gke).
\ No newline at end of file
+Please use the RabbitMQ Cluster Operator: [link](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
diff --git a/deps/rabbitmq_peer_discovery_k8s/examples/kind/README.md b/deps/rabbitmq_peer_discovery_k8s/examples/kind/README.md
index 1045547a9915..2de34b212980 100644
--- a/deps/rabbitmq_peer_discovery_k8s/examples/kind/README.md
+++ b/deps/rabbitmq_peer_discovery_k8s/examples/kind/README.md
@@ -1,3 +1,7 @@
-# Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Kind
+# Recommended Deployment
 
-This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/kind).
+In Production, use the RabbitMQ Cluster Operator: [link](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
+
+## Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Kind
+
+This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/kind#production-non-suitability)
diff --git a/deps/rabbitmq_peer_discovery_k8s/examples/minikube/README.md b/deps/rabbitmq_peer_discovery_k8s/examples/minikube/README.md
index 57dbc6722747..ecf90a86a063 100644
--- a/deps/rabbitmq_peer_discovery_k8s/examples/minikube/README.md
+++ b/deps/rabbitmq_peer_discovery_k8s/examples/minikube/README.md
@@ -1,3 +1,7 @@
-# Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Minikube
+# Recommended Deployment
 
-This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/minikube).
\ No newline at end of file
+In Production, use the RabbitMQ Cluster Operator: [link](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
+
+## Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Minikube
+
+This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/minikube).