diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8ac53d5..19320ac3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+# [Unreleased]
+### Added
+* *Nothing*
+
+### Changed
+* * [#2281](https://github.com/shlinkio/shlink/issues/2281) Update docker image to PHP 8.4
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* *Nothing*
+
+
 # [4.3.1] - 2024-11-25
 ### Added
 * *Nothing*
diff --git a/Dockerfile b/Dockerfile
index 4f3d1ca6..73e62b39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.20 AS base
+FROM php:8.4-alpine3.20 AS base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
@@ -36,7 +36,7 @@ RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
     apk del .phpize-deps
 
 # Install shlink
-FROM base as builder
+FROM base AS builder
 COPY . .
 COPY --from=composer:2 /usr/bin/composer ./composer.phar
 RUN apk add --no-cache git && \
diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile
index e594664b..3d9ea0ad 100644
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-fpm-alpine3.20
+FROM php:8.4-fpm-alpine3.20
 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 198a6867..f01943b0 100644
--- a/data/infra/roadrunner.Dockerfile
+++ b/data/infra/roadrunner.Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.20
+FROM php:8.4-alpine3.20
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV PDO_SQLSRV_VERSION 5.12.0