diff --git a/Dockerfile b/Dockerfile
index 73e62b39..eea707f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4-alpine3.20 AS base
+FROM php:8.4-alpine3.21 AS base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile
index 3d9ea0ad..0c08124f 100644
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4-fpm-alpine3.20
+FROM php:8.4-fpm-alpine3.21
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.24
diff --git a/data/infra/roadrunner.Dockerfile b/data/infra/roadrunner.Dockerfile
index f01943b0..3619aba3 100644
--- a/data/infra/roadrunner.Dockerfile
+++ b/data/infra/roadrunner.Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4-alpine3.20
+FROM php:8.4-alpine3.21
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV PDO_SQLSRV_VERSION 5.12.0
diff --git a/module/Core/src/Geolocation/GeolocationDbUpdater.php b/module/Core/src/Geolocation/GeolocationDbUpdater.php
index b8d77a4b..9c7d61d3 100644
--- a/module/Core/src/Geolocation/GeolocationDbUpdater.php
+++ b/module/Core/src/Geolocation/GeolocationDbUpdater.php
@@ -47,7 +47,7 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
         }
 
         $lock = $this->locker->createLock(self::LOCK_NAME);
-        $lock->acquire(true); // Block until lock is released
+        $lock->acquire(blocking: true);
 
         try {
             return $this->downloadIfNeeded($downloadProgressHandler);
diff --git a/module/Core/src/ShortUrl/Resolver/PersistenceShortUrlRelationResolver.php b/module/Core/src/ShortUrl/Resolver/PersistenceShortUrlRelationResolver.php
index df578387..7f43d443 100644
--- a/module/Core/src/ShortUrl/Resolver/PersistenceShortUrlRelationResolver.php
+++ b/module/Core/src/ShortUrl/Resolver/PersistenceShortUrlRelationResolver.php
@@ -106,8 +106,8 @@ class PersistenceShortUrlRelationResolver implements ShortUrlRelationResolverInt
     {
         // Lock dependency creation for up to 5 seconds. This will prevent errors when trying to create the same one
         // more than once in parallel.
-        $locks[$name] = $lock = $this->locker->createLock($name, 5);
-        $lock->acquire(true);
+        $locks[$name] = $lock = $this->locker->createLock($name, ttl: 5);
+        $lock->acquire(blocking: true);
     }
 
     /**