diff --git a/on_host/compile.sh b/on_host/compile.sh
index 467e335..06f74bb 100644
--- a/on_host/compile.sh
+++ b/on_host/compile.sh
@@ -18,7 +18,7 @@ sudo apt-get install -y \
     libminiupnpc-dev
 mkdir /tmp/BUILD_I2PD/
 cd /tmp/BUILD_I2PD/
-git clone --depth 1 --branch 2.53.1 https://github.com/PurpleI2P/i2pd.git
+git clone --depth 1 --branch 2.54.0 https://github.com/PurpleI2P/i2pd.git
 cd /tmp/BUILD_I2PD/i2pd/build
 cmake -DCMAKE_BUILD_TYPE=Release -DWITH_AESNI=ON -DWITH_UPNP=ON .
 make
diff --git a/src/Dockerfile b/src/Dockerfile
index 62c9801..f17225a 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG UBUNTU_VERSION=24.04
 FROM ubuntu:${UBUNTU_VERSION} AS builder_i2pd
-ARG I2PD_VERSION=2.53.1
+ARG I2PD_VERSION=2.54.0
 ARG I2PD_COMPILER=gcc
 RUN DEBIAN_FRONTEND=noninteractive\
     apt-get update &&\
@@ -32,7 +32,7 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release -DWITH_AESNI=ON -DWITH_UPNP=ON .
 RUN make
 
 FROM ubuntu:${UBUNTU_VERSION} as builder_yggdrasil
-ARG YGGDRASIL_VERSION=v0.5.7
+ARG YGGDRASIL_VERSION=v0.5.8
 RUN DEBIAN_FRONTEND=noninteractive\
     apt-get update &&\
     apt-get -y upgrade
diff --git a/support/make_docker_image.sh b/support/make_docker_image.sh
index 33fd8f9..e485358 100644
--- a/support/make_docker_image.sh
+++ b/support/make_docker_image.sh
@@ -2,9 +2,9 @@
 TAG_VERSION=$(git describe --tags || echo "unknown")
 docker build --file="src/Dockerfile" \
     --build-arg UBUNTU_VERSION=24.04 \
-    --build-arg I2PD_VERSION=2.53.1 \
+    --build-arg I2PD_VERSION=2.54.0 \
     --build-arg I2PD_COMPILER=gcc \
-    --build-arg YGGDRASIL_VERSION=v0.5.7 \
+    --build-arg YGGDRASIL_VERSION=v0.5.8 \
     --tag i2pd_yggdrasil:${TAG_VERSION} \
     --tag i2pd_yggdrasil:latest \
     .