diff --git a/Gemfile b/Gemfile
index 34f6fac2a44..1af825677bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@ gem "scimitar", "~> 2.11"
 gem "acts_as_list", "~> 1.2.0"
 gem "acts_as_tree", "~> 2.9.0"
 gem "awesome_nested_set", "~> 3.8.0"
-gem "closure_tree", "~> 8.0.0"
+gem "closure_tree", "~> 9.0.0"
 gem "rubytree", "~> 2.1.0"
 # Only used in down migrations now.
 # Is to be removed once the referencing migrations have been squashed.
@@ -403,7 +403,7 @@ gem "activerecord-nulldb-adapter", "~> 1.1.1"
 
 # Have application level locks on the database to have a mutex shared between workers/hosts.
 # We e.g. employ this to safeguard the creation of journals.
-gem "with_advisory_lock", "~> 5.3.0"
+gem "with_advisory_lock", "~> 7.0.1"
 
 # Load Gemfile.modules explicitly to allow dependabot to work
 eval_gemfile "./Gemfile.modules"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1694e59d64b..d3f8db98d5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -422,9 +422,9 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     climate_control (1.2.0)
-    closure_tree (8.0.0)
-      activerecord (>= 7.1.0)
-      with_advisory_lock (>= 5.0.0, < 6.0.0)
+    closure_tree (9.0.0)
+      activerecord (>= 7.2.0)
+      with_advisory_lock (>= 7.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -1292,9 +1292,9 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.1)
-    with_advisory_lock (5.3.0)
-      activerecord (>= 6.1)
-      zeitwerk (>= 2.6)
+    with_advisory_lock (7.0.1)
+      activerecord (>= 7.2)
+      zeitwerk (>= 2.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yabeda (0.13.1)
@@ -1363,7 +1363,7 @@ DEPENDENCIES
   carrierwave (~> 1.3.4)
   carrierwave_direct (~> 2.1.0)
   climate_control
-  closure_tree (~> 8.0.0)
+  closure_tree (~> 9.0.0)
   colored2
   commonmarker (~> 2.3.0)
   compare-xml (~> 0.66)
@@ -1544,7 +1544,7 @@ DEPENDENCIES
   warden-basic_auth (~> 0.2.1)
   webmock (~> 3.12)
   will_paginate (~> 4.0.0)
-  with_advisory_lock (~> 5.3.0)
+  with_advisory_lock (~> 7.0.1)
   yabeda-activerecord
   yabeda-prometheus-mmap
   yabeda-puma-plugin
@@ -1614,7 +1614,7 @@ CHECKSUMS
   cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da
   childprocess (5.1.0) sha256=9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec
   climate_control (1.2.0) sha256=36b21896193fa8c8536fa1cd843a07cf8ddbd03aaba43665e26c53ec1bd70aa5
-  closure_tree (8.0.0) sha256=9f33c8b2511db80d3cb418cba34da85176585bb9f1077c5d58e873e2495dbbcb
+  closure_tree (9.0.0) sha256=0aefc60e5e4b812ebaa34c38d8de5d7add2600f888485f266485787b17f034a8
   coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
   coercible (1.0.0) sha256=5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc
   color_conversion (0.1.2) sha256=99bea5fa412e1527a11389975aa6ad445ff8528ebae202c11d08c45ea2b94c96
@@ -2004,7 +2004,7 @@ CHECKSUMS
   websocket-driver (0.8.0) sha256=ed0dba4b943c22f17f9a734817e808bc84cdce6a7e22045f5315aa57676d4962
   websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
   will_paginate (4.0.1) sha256=107b226ebe1d393d274575956a7c472e1eefdd97d8828e01b72d425d15a875b9
-  with_advisory_lock (5.3.0) sha256=bdb1864430853fe9081a7765f2d5b7cc42725c9ccf1901d20e9989828901b94e
+  with_advisory_lock (7.0.1) sha256=58b8a0a9a428e2d335e3791b745c9e98d092a6d5ee92dfafe400b40e8bcfde8a
   xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e
   yabeda (0.13.1) sha256=3213025f22b7746602c8a4c41e2ed82d73a90bdc5489f6ef472142b06c1cf954
   yabeda-activerecord (0.1.1) sha256=ae338213c264f20d8642e8bf47ac6058c49a6f7c8c00c892cd5765332914f45f
diff --git a/lib/open_project/mutex.rb b/lib/open_project/mutex.rb
index f226195fbed..37be056893e 100644
--- a/lib/open_project/mutex.rb
+++ b/lib/open_project/mutex.rb
@@ -80,7 +80,7 @@ module OpenProject
         #{action}:
           * lockname: #{lock_name}
           * thread:  #{Thread.current.object_id}
-          * held locks: #{WithAdvisoryLock::Base.lock_stack.map(&:name).join(', ')}
+          * held locks: #{ActiveRecord::Base.current_advisory_locks.join(', ')}
       MESSAGE
 
       Rails.logger.debug { message }