diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,13 @@
 
 `tmp-proc-rabbitmq` uses [PVP Versioning][1].
 
+## 0.8.0.0 -- 2026-10-18
+
+* Extend the upper bound for tmp-proc to allow 0.8
+* Add `uriOfRootlessWith` to `TmpRabbitMQ` for rootless docker support
+* Update Docker image from `rabbitmq:3.9` to `rabbitmq:3`
+* Increase `pingCount` to 10 (30 s startup grace) to reduce flakiness on CI
+
 ## 0.7.2.4 -- 2025-03-25
 
 * Relax the upper bound on bytestring
diff --git a/src/System/TmpProc/Docker/RabbitMQ.hs b/src/System/TmpProc/Docker/RabbitMQ.hs
--- a/src/System/TmpProc/Docker/RabbitMQ.hs
+++ b/src/System/TmpProc/Docker/RabbitMQ.hs
@@ -33,7 +33,6 @@
 import Control.Exception (throwIO)
 import qualified Data.ByteString.Char8 as C8
 import Data.Proxy (Proxy (..))
-import qualified Data.Text as Text
 import Network.AMQP
 import System.TmpProc
   ( Connectable (..)
@@ -43,6 +42,8 @@
   , Proc (..)
   , ProcHandle (..)
   , SvcURI
+  , addrHost
+  , addrPort
   , only
   , startupAll
   , toPinged
@@ -66,7 +67,7 @@
 
 -- | Specifies how to run @RabbitMQ@ as a @tmp proc@.
 instance Proc TmpRabbitMQ where
-  type Image TmpRabbitMQ = "rabbitmq:3.9"
+  type Image TmpRabbitMQ = "rabbitmq:3"
   type Name TmpRabbitMQ = "a-rabbitmq-server"
 
 
@@ -74,7 +75,12 @@
   runArgs = []
   ping = toPinged @AMQPException Proxy . openConn'
   reset _ = pure ()
+  pingCount = 10
   pingGap = 3 * 1000000
+  uriOfRootlessWith addr pairs =
+    case lookup 5672 pairs of
+      Just hp -> "amqp://guest:guest@" <> addrPort addr hp <> "@/%2f"
+      Nothing -> mkUri' addr
 
 
 -- | Specifies how to connect to a tmp @RabbitMQ@ service.
@@ -90,7 +96,7 @@
 mkUri' :: HostIpAddress -> SvcURI
 mkUri' ip =
   "amqp://guest:guest@"
-    <> C8.pack (Text.unpack ip)
+    <> addrHost ip
     <> ":5672@/%2f"
 
 
diff --git a/tmp-proc-rabbitmq.cabal b/tmp-proc-rabbitmq.cabal
--- a/tmp-proc-rabbitmq.cabal
+++ b/tmp-proc-rabbitmq.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               tmp-proc-rabbitmq
-version:            0.7.2.4
+version:            0.8.0.0
 synopsis:           Launch RabbitMQ in docker using tmp-proc
 description:
   Demos how to use tmp-proc to run RabbitMQ in docker in a unittest.
@@ -31,7 +31,7 @@
     , base        >=4.11     && <5
     , bytestring  >=0.10.8   && <0.11 || >=0.11.3 && <0.13
     , text        >=1.2.3 && <2.2
-    , tmp-proc    >=0.5.3 && <0.8
+    , tmp-proc    >=0.5.3 && <0.9
 
   default-language: Haskell2010
   ghc-options:      -fno-ignore-asserts -Wall