diff --git a/distgen/distconf/fedora-40-i686.yaml b/distgen/distconf/fedora-40-i686.yaml
new file mode 100644
index 0000000..87e8ca8
--- /dev/null
+++ b/distgen/distconf/fedora-40-i686.yaml
@@ -0,0 +1,7 @@
+extends: "lib/fedora.yaml"
+
+package_installer:
+  name: dnf
+
+os:
+  version: 40
diff --git a/distgen/distconf/fedora-40-x86_64.yaml b/distgen/distconf/fedora-40-x86_64.yaml
new file mode 100644
index 0000000..2ceb066
--- /dev/null
+++ b/distgen/distconf/fedora-40-x86_64.yaml
@@ -0,0 +1,10 @@
+extends: "fedora-40-i686.yaml"
+
+macros:
+  libdir: $prefix/lib64
+
+os:
+  arch: x86_64
+
+docker:
+  from: fedora:40
diff --git a/distgen/distconf/fedora-41-i686.yaml b/distgen/distconf/fedora-41-i686.yaml
new file mode 100644
index 0000000..133e1a8
--- /dev/null
+++ b/distgen/distconf/fedora-41-i686.yaml
@@ -0,0 +1,7 @@
+extends: "lib/fedora.yaml"
+
+package_installer:
+  name: dnf
+
+os:
+  version: 41
diff --git a/distgen/distconf/fedora-41-x86_64.yaml b/distgen/distconf/fedora-41-x86_64.yaml
new file mode 100644
index 0000000..b5deefc
--- /dev/null
+++ b/distgen/distconf/fedora-41-x86_64.yaml
@@ -0,0 +1,10 @@
+extends: "fedora-41-i686.yaml"
+
+macros:
+  libdir: $prefix/lib64
+
+os:
+  arch: x86_64
+
+docker:
+  from: fedora:41
diff --git a/distgen/distconf/fedora-42-i686.yaml b/distgen/distconf/fedora-42-i686.yaml
new file mode 100644
index 0000000..76fc5fe
--- /dev/null
+++ b/distgen/distconf/fedora-42-i686.yaml
@@ -0,0 +1,7 @@
+extends: "lib/fedora.yaml"
+
+package_installer:
+  name: dnf
+
+os:
+  version: 42
diff --git a/distgen/distconf/fedora-42-x86_64.yaml b/distgen/distconf/fedora-42-x86_64.yaml
new file mode 100644
index 0000000..66e0f71
--- /dev/null
+++ b/distgen/distconf/fedora-42-x86_64.yaml
@@ -0,0 +1,10 @@
+extends: "fedora-42-i686.yaml"
+
+macros:
+  libdir: $prefix/lib64
+
+os:
+  arch: x86_64
+
+docker:
+  from: fedora:42
diff --git a/distgen/distconf/fedora-rawhide-i686.yaml b/distgen/distconf/fedora-rawhide-i686.yaml
index 9720622..aacf0a7 120000
--- a/distgen/distconf/fedora-rawhide-i686.yaml
+++ b/distgen/distconf/fedora-rawhide-i686.yaml
@@ -1 +1 @@
-fedora-39-i686.yaml
\ No newline at end of file
+fedora-42-i686.yaml
\ No newline at end of file
diff --git a/tests/dockerfile/test.exp b/tests/dockerfile/test.exp
index 109b1e8..8811f1b 100644
--- a/tests/dockerfile/test.exp
+++ b/tests/dockerfile/test.exp
@@ -77,7 +77,7 @@ MAINTAINER Pavel Raiskup <praiskup@redhat.com>
 
 ENV container="docker" \
     PGDATA="/var/lib/pgsql/data" \
-    TEST_VAR="build_for fedora-39-x86_64"
+    TEST_VAR="build_for fedora-42-x86_64"
 
 RUN dnf -y --setopt=tsflags=nodocs install postgresql-server \
     && dnf -y --setopt=tsflags=nodocs reinstall glibc-common \