diff --git a/transports/rabbitmq/delayed-delivery.md b/transports/rabbitmq/delayed-delivery.md
index ed486f627b2..ab8acd33f63 100644
--- a/transports/rabbitmq/delayed-delivery.md
+++ b/transports/rabbitmq/delayed-delivery.md
@@ -185,4 +185,4 @@ partial: disabledelayeddelivery
 
 When upgrading the RabbitMQ cluster, it is recommended to use the [rolling (in-place)](https://www.rabbitmq.com/docs/upgrade#rolling-upgrade) method.
 
-Due to the way the native delayed delivery infrastructure is implemented, upgrading RabbitMQ by using [blue-green deployments](https://www.rabbitmq.com/docs/upgrade#blue-green-deployment) is more complicated and requires the specialized shovelling of delayed messages in order to avoid message loss. You can use one of the supported cli tools like [`delays transfer`](operations-scripting.md#delays-transfer) to aid with the shoveling.
+Upgrading RabbitMQ by using [blue-green deployments](https://www.rabbitmq.com/docs/upgrade#blue-green-deployment) is more complicated because delayed messages cannot be moved with standard tools like the [shovel](https://www.rabbitmq.com/docs/shovel) which are not aware of the how the delay infrastructure is implemented. The [`delays transfer`](operations-scripting.md#delays-transfer) command should be used to move delayed messages from one broker to another.
diff --git a/transports/rabbitmq/operations-scripting_content_rabbit_[11,).partial.md b/transports/rabbitmq/operations-scripting_content_rabbit_[11,).partial.md
index 1b06f02e72a..add3aa760fc 100644
--- a/transports/rabbitmq/operations-scripting_content_rabbit_[11,).partial.md
+++ b/transports/rabbitmq/operations-scripting_content_rabbit_[11,).partial.md
@@ -61,6 +61,13 @@ rabbitmq-transport delays migrate [options]
 `--disableCertValidation`: Disable remote certificate validation when connecting to the broker<br />
 `--routingTopology` | `-r` : The routing topology to use<br />
 
+> [!NOTE]
+> Before running this command, the destination broker must have the v2 delay infrastructure in place. Use the [`delays create`](#delays-create) command to set it up:
+>
+> ```
+> rabbitmq-transport delays create --connectionString "amqp://user:pass@destination-host"
+> ```
+
 ### `delays transfer`
 
 Use this command to transfer delayed messages from one broker to another:
@@ -93,7 +100,7 @@ rabbitmq-transport delays transfer [options]
 > Before running this command, the destination broker must have the v2 delay infrastructure in place. Use the [`delays create`](#delays-create) command to set it up:
 >
 > ```
-> rabbitmq-transport delays create --connectionString "amqp://user:pass@destination-host" --managementApiUrl "http://destination-host:15672"
+> rabbitmq-transport delays create --connectionString "amqp://user:pass@destination-host"
 > ```
 
 > [!NOTE]
@@ -106,7 +113,7 @@ rabbitmq-transport delays transfer [options]
 #### Usage example
 
 ```
-rabbitmq-transport delays transfer --sourceConnectionString "amqp://user:pass@source-host" --destinationConnectionString "amqp://user:pass@destination-host" 
+rabbitmq-transport delays transfer --sourceConnectionString "amqp://user:pass@source-host" --destinationConnectionString "amqp://user:pass@destination-host"
 ```
 
 ### `delays verify`