diff --git a/manifests/init.pp b/manifests/init.pp
index cf5ec1fc1..e437a1f8a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,7 +53,7 @@
 #   (optional) The rpc backend implementation to use, can be:
 #     rabbit (for rabbitmq)
 #     zmq (for zeromq)
-#   Defaults to 'rabbit'
+#   Defaults to $::os_service_default
 #
 # [*image_service*]
 #   (optional) Service used to search for and retrieve images.
diff --git a/releasenotes/notes/remove_qpid_references-0ce3d525e7e32ae4.yaml b/releasenotes/notes/remove_qpid_references-0ce3d525e7e32ae4.yaml
new file mode 100644
index 000000000..6f5286128
--- /dev/null
+++ b/releasenotes/notes/remove_qpid_references-0ce3d525e7e32ae4.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - Drop all qpid references in code since it's been
+    deprecated already.