diff --git a/Dockerfile b/Dockerfile
index 47963025d..38529c108 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,10 @@
-FROM fedora:38 AS builder
+FROM fedora:40 AS dependencies
+
+RUN dnf -y update && dnf -y install mongo-c-driver-devel libbson-devel httpd httpd-devel httpd-tools net-tools wget tar bzip2 p7zip fuse-devel htop make gcc glibc-devel glibc-static bison flex gawk sed file zlib zlib-devel ncurses ncurses-devel expat expat-devel gettext gettext-devel libzip libzip-devel libcurl libcurl-devel libuuid libuuid-devel openssl openssl-devel git bc vim wget fuse-sshfs kernel-tools gcc strace valgrind gcc-c++ libstdc++-static python python3 nasm libstdc++-devel glibc-devel.i686 glibc-static.i686 libstdc++-devel.i686 libstdc++-static.i686 libtool autoconf automake clang clang-devel clang-libs python2 pypy pypy3 rust nodejs swift-lang mariadb-connector-c-devel mariadb-server-utils mariadb-common mariadb-errmsg glibc-locale-source golang gdb elfutils-libelf-devel procps hiredis-devel
+
+RUN dnf clean all
+
+FROM dependencies AS build
 
 WORKDIR /app
 COPY . /app
diff --git a/docker/build.sh b/docker/build.sh
index 2229230c9..c2c0630a5 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,12 +1,6 @@
 #! /bin/bash
 
-set -ex
-
-dnf -y update && dnf -y install mongo-c-driver-devel libbson-devel httpd httpd-devel httpd-tools net-tools wget tar bzip2 p7zip fuse-devel htop make gcc glibc-devel glibc-static bison flex gawk sed file zlib zlib-devel ncurses ncurses-devel expat expat-devel gettext gettext-devel libzip libzip-devel libcurl libcurl-devel libuuid libuuid-devel openssl openssl-devel git bc vim wget fuse-sshfs kernel-tools gcc strace valgrind gcc-c++ libstdc++-static python python3 nasm libstdc++-devel glibc-devel.i686 glibc-static.i686 libstdc++-devel.i686 libstdc++-static.i686 libtool autoconf automake clang clang-devel clang-libs python2 pypy pypy3 rust nodejs swift-lang mariadb-connector-c-devel mariadb-server-utils mariadb-common mariadb-errmsg glibc-locale-source golang gdb elfutils-libelf-devel procps hiredis-devel
-
-dnf clean all
-
-set +e
+set -x
 
 localedef -v -c -i ru_RU -f UTF-8 ru_RU.UTF-8