diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index 2fc71ba6aa..a4d402101a 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -24,7 +24,8 @@ on:
           "ubuntu-lunar",
           "ubuntu-mantic",
           "almalinux-8",
-          "fedora-39"
+          "fedora-39",
+          "fedora-40"
         ]'
 
 
diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml
index ec3b976d45..def841331b 100644
--- a/.github/workflows/dbld-images.yml
+++ b/.github/workflows/dbld-images.yml
@@ -31,6 +31,7 @@ jobs:
         image:
           - almalinux-8
           - fedora-39
+          - fedora-40
           - debian-bullseye
           - debian-bookworm
           - debian-sid
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 73cd64ca05..d313ef6e25 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -37,6 +37,6 @@ jobs:
         "almalinux-8",
         "debian-bookworm",
         "debian-testing",
-        "fedora-39",
+        "fedora-40",
         "ubuntu-noble"
       ]'
diff --git a/dbld/Makefile.am b/dbld/Makefile.am
index b8abf56ae3..5e5282a5ae 100644
--- a/dbld/Makefile.am
+++ b/dbld/Makefile.am
@@ -29,6 +29,7 @@ EXTRA_DIST += \
 	dbld/images/almalinux-8.dockerfile \
 	dbld/images/devshell.dockerfile \
 	dbld/images/fedora-39.dockerfile \
+	dbld/images/fedora-40.dockerfile \
 	dbld/images/debian-bullseye.dockerfile \
 	dbld/images/debian-bookworm.dockerfile \
 	dbld/images/debian-sid.dockerfile \
diff --git a/dbld/images/fedora-40.dockerfile b/dbld/images/fedora-40.dockerfile
new file mode 100644
index 0000000000..bb5623cac6
--- /dev/null
+++ b/dbld/images/fedora-40.dockerfile
@@ -0,0 +1,26 @@
+FROM fedora:40
+LABEL maintainer="László Várady <laszlo.varady@axoflow.com>, Balazs Scheidler <bazsi77@gmail.com>"
+ENV OS_DISTRIBUTION=fedora
+ENV OS_DISTRIBUTION_CODE_NAME=40
+
+ARG ARG_IMAGE_PLATFORM
+ARG COMMIT
+ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM}
+LABEL COMMIT=${COMMIT}
+
+COPY images/entrypoint.sh /
+COPY . /dbld/
+
+RUN /dbld/builddeps workaround_rpm_repos
+RUN /dbld/builddeps install_dbld_dependencies
+RUN /dbld/builddeps add_copr_repo
+RUN /dbld/builddeps install_yum_packages
+RUN /dbld/builddeps install_rpm_build_deps
+
+RUN /dbld/builddeps install_criterion
+RUN /dbld/builddeps install_gradle
+
+VOLUME /source
+VOLUME /build
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dbld/rules b/dbld/rules
index 63ea95849b..f764617d09 100755
--- a/dbld/rules
+++ b/dbld/rules
@@ -3,6 +3,7 @@
 BUILDER_IMAGES=		\
 	almalinux-8	\
 	fedora-39	\
+	fedora-40	\
 	debian-stretch	\
 	debian-bullseye	\
 	debian-bookworm	\