diff --git a/source/mainnet/net/guides/run-node-macos.rst b/source/mainnet/net/guides/run-node-macos.rst
index 1c231e4f5b..77667d07c5 100644
--- a/source/mainnet/net/guides/run-node-macos.rst
+++ b/source/mainnet/net/guides/run-node-macos.rst
@@ -67,7 +67,7 @@ Install/upgrade and run a node
 .. dropdown:: Mainnet
 
   .. Note::
-    See :ref:`change-node-settings` for information about how to change the service configuration settings. See :ref:`configure-baker-macos` for information about how to set the location of baker credentials.
+    See :ref:`change-node-settings` for information about how to change the service configuration settings. See :ref:`baker-macos` for information about how to set the location of baker credentials.
 
   #. Go to :ref:`Downloads<node-downloads>`, and download the latest macOS installer package (.pkg file).
 
@@ -107,7 +107,7 @@ Install/upgrade and run a node
 .. dropdown:: Testnet
 
   .. Note::
-    See :ref:`change-node-settings` for information about how to change the service configuration settings. See :ref:`configure-baker-macos` for information about how to set the location of baker credentials.
+    See :ref:`change-node-settings` for information about how to change the service configuration settings. See :ref:`baker-macos` for information about how to set the location of baker credentials.
 
   #. Go to :ref:`Downloads<testnet-node-downloads>`, and download the latest macOS installer package (.pkg file).
 
@@ -286,6 +286,9 @@ Since the GRPC V2 port is different than the GRPC V1 port, you need to change it
 
 .. _configure-baker-macos:
 
+.. Note::
+   If the node is `configured with TLS <https://github.com/Concordium/concordium-node/blob/main/docs/grpc2.md#grpc-api-v2>`_, then `CONCORDIUM_NODE_COLLECTOR_GRPC_HOST` must be configured such that it uses the domain of the certificate.
+
 Configure a node as a baker
 ===========================
 
diff --git a/source/mainnet/net/guides/run-node-ubuntu.rst b/source/mainnet/net/guides/run-node-ubuntu.rst
index e2c0ed6ac9..691c9f2d60 100644
--- a/source/mainnet/net/guides/run-node-ubuntu.rst
+++ b/source/mainnet/net/guides/run-node-ubuntu.rst
@@ -135,6 +135,9 @@ This will open your overrides in your default editor. Below is an example for th
 
 .. _upgrade-node-Ubuntu:
 
+.. Note::
+   If the node is `configured with TLS <https://github.com/Concordium/concordium-node/blob/main/docs/grpc2.md#grpc-api-v2>`_, then `CONCORDIUM_NODE_COLLECTOR_GRPC_HOST` must be configured such that it uses the domain of the certificate, for example, ``Environment=CONCORDIUM_NODE_COLLECTOR_GRPC_HOST=https://example.concordium-node.io:20000``.
+
 Upgrade version
 ===============
 
diff --git a/source/mainnet/net/guides/run-node-windows.rst b/source/mainnet/net/guides/run-node-windows.rst
index 054bac4177..2b9366245f 100644
--- a/source/mainnet/net/guides/run-node-windows.rst
+++ b/source/mainnet/net/guides/run-node-windows.rst
@@ -246,6 +246,9 @@ Node collector configuration
 
 Since version 5.3.2 of the node, the collector uses the GRPC V2 interface. Therefore, in order to run the collector, it is required that the node which the collector connects to has the GRPC V2 interface enabled. For information about how to do this, see :ref:`the note at the top of this topic<install-upgrade-node-windows>`.
 
+.. Note::
+   If the node is `configured with TLS <https://github.com/Concordium/concordium-node/blob/main/docs/grpc2.md#grpc-api-v2>`_, then `CONCORDIUM_NODE_COLLECTOR_GRPC_HOST` must be configured such that it uses the domain of the certificate.
+
 Baking on a Windows node
 ========================
 
diff --git a/source/mainnet/net/guides/run-node.rst b/source/mainnet/net/guides/run-node.rst
index 40a8896b16..9ae9bef388 100644
--- a/source/mainnet/net/guides/run-node.rst
+++ b/source/mainnet/net/guides/run-node.rst
@@ -92,6 +92,9 @@ The node requires a database which must be stored on the host system so that it
    enabled, make sure to edit your configuration, adding ``CONCORDIUM_NODE_GRPC2_LISTEN_PORT``
    and ``CONCORDIUM_NODE_GRPC2_LISTEN_ADDRESS`` as in the sample configurations.
 
+.. Note::
+   If the node is `configured with TLS <https://github.com/Concordium/concordium-node/blob/main/docs/grpc2.md#grpc-api-v2>`_, then `CONCORDIUM_NODE_COLLECTOR_GRPC_HOST` must be configured such that it uses the domain of the certificate, for example, ``CONCORDIUM_NODE_COLLECTOR_GRPC_HOST=https://example.concordium-node.io:20000``.
+
 .. Note::
 
    When upgrading, you can only upgrade one minor version at a time, or from the last release of major version X to major version X+1. You cannot skip versions. For patches, you can skip versions e.g. X.X.0 to X.X.3, or `X.1.1` to `X.2.3`.
diff --git a/source/mainnet/net/nodes/run-node-ubuntu.rst b/source/mainnet/net/nodes/run-node-ubuntu.rst
index 87235fa972..451d79292d 100644
--- a/source/mainnet/net/nodes/run-node-ubuntu.rst
+++ b/source/mainnet/net/nodes/run-node-ubuntu.rst
@@ -132,6 +132,9 @@ This will open your overrides in your default editor. Below is an example for th
   [Service]
   Environment=CONCORDIUM_NODE_COLLECTOR_GRPC_HOST=http://localhost:20001
 
+.. Note::
+   If the node is `configured with TLS <https://github.com/Concordium/concordium-node/blob/main/docs/grpc2.md#grpc-api-v2>`_, then `CONCORDIUM_NODE_COLLECTOR_GRPC_HOST` must be configured such that it uses the domain of the certificate, for example, ``Environment=CONCORDIUM_NODE_COLLECTOR_GRPC_HOST=https://example.concordium-node.io:20000``.
+
 .. _upgrade-node-Ubuntu-testnet:
 
 Upgrade version