diff --git a/Makefile b/Makefile
index 1ff319a0f6..d266dbf5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -136,6 +136,12 @@ TMT_TEST_CONTAINER_IMAGES := $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/alpine:late
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/43/unprivileged:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44/unprivileged:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/upstream:latest \
+                             $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/unprivileged:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/8/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubuntu/22.04/upstream:latest \
                              $(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/debian/12.7/upstream:latest \
@@ -286,6 +292,15 @@ $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/4
 $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/44/unprivileged\:latest:
 	$(call build-test-container-image,$@,fedora/44/Containerfile.unprivileged)
 
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45\:latest:
+	$(call build-test-container-image,$@,fedora/45/Containerfile)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/upstream\:latest:
+	$(call build-test-container-image,$@,fedora/45/Containerfile.upstream)
+
+$(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/fedora/45/unprivileged\:latest:
+	$(call build-test-container-image,$@,fedora/45/Containerfile.unprivileged)
+
 $(TMT_TEST_IMAGE_TARGET_PREFIX)/$(TMT_TEST_CONTAINER_IMAGE_NAME_PREFIX)/ubi/8/upstream\:latest:
 	$(call build-test-container-image,$@,ubi/8/Containerfile.upstream)
 
diff --git a/containers/fedora/44/Containerfile b/containers/fedora/44/Containerfile
new file mode 100644
index 0000000000..ee5b263134
--- /dev/null
+++ b/containers/fedora/44/Containerfile
@@ -0,0 +1,22 @@
+#
+# A Fedora 44 image tailored for tmt test suite
+#
+# tmt/tests/fedora/44:latest
+#
+
+FROM quay.io/fedora/fedora:44
+
+# hadolint ignore=DL3040
+RUN <<EOF
+set -ex
+
+# Populate dnf cache
+dnf makecache
+
+# Make sure the image is built with the latest packages
+dnf update -y
+
+# Inject `dnf5` to make things more complicated for `dnf` family of
+# package manager implementations
+dnf install -y dnf5
+EOF
diff --git a/containers/fedora/44/Containerfile.unprivileged b/containers/fedora/44/Containerfile.unprivileged
new file mode 100644
index 0000000000..9dc7a86e0d
--- /dev/null
+++ b/containers/fedora/44/Containerfile.unprivileged
@@ -0,0 +1,26 @@
+#
+# A Fedora 44 image tailored for tmt test suite, with unprivileged account & password-less sudo
+#
+# tmt/tests/fedora/44/unprivileged:latest
+#
+
+FROM quay.io/fedora/fedora:44
+
+# hadolint ignore=DL3040
+RUN <<EOF
+set -ex
+
+# Populate dnf cache
+dnf makecache
+
+# Make sure the image is built with the latest packages
+dnf update -y
+
+# Create unprivileged user and setup sudo for it
+dnf install -y /usr/sbin/useradd
+useradd fedora
+usermod -aG wheel fedora
+printf "fedora\tALL=(ALL)\tNOPASSWD: ALL" >> /etc/sudoers
+EOF
+
+USER fedora
diff --git a/containers/fedora/44/Containerfile.upstream b/containers/fedora/44/Containerfile.upstream
new file mode 100644
index 0000000000..6058ce4cb6
--- /dev/null
+++ b/containers/fedora/44/Containerfile.upstream
@@ -0,0 +1,17 @@
+#
+# A Fedora 44 image tailored for tmt test suite
+#
+# tmt/tests/fedora/44/upstream:latest
+#
+
+FROM quay.io/fedora/fedora:44
+
+RUN <<EOF
+set -ex
+
+# Populate dnf cache
+dnf makecache
+
+# Make sure the image is built with the latest packages
+dnf update -y
+EOF
diff --git a/containers/fedora/44 b/containers/fedora/45
similarity index 100%
rename from containers/fedora/44
rename to containers/fedora/45
diff --git a/docs/ext/tmt_setup.py b/docs/ext/tmt_setup.py
index 847253140d..eb037eb860 100644
--- a/docs/ext/tmt_setup.py
+++ b/docs/ext/tmt_setup.py
@@ -16,11 +16,11 @@ def setup(app: "Sphinx") -> None:
     # This is a meta extension that gathers all of the individual extensions
     # in the ext folder.
     app.setup_extension("linkcheck_cache")
-    app.setup_extension("sphinx_apidoc")
-    app.setup_extension("generate_lint_checks")
-    app.setup_extension("generate_hardware_matrix")
-    app.setup_extension("generate_test_runner_guest_matrix")
-    app.setup_extension("generate_template_extensions")
-    app.setup_extension("generate_plugins")
+    # app.setup_extension("sphinx_apidoc")
+    # app.setup_extension("generate_lint_checks")
+    # app.setup_extension("generate_hardware_matrix")
+    # app.setup_extension("generate_test_runner_guest_matrix")
+    # app.setup_extension("generate_template_extensions")
+    # app.setup_extension("generate_plugins")
     app.setup_extension("generate_release_notes")
     app.setup_extension("tmt_domain")
diff --git a/tests/images.sh b/tests/images.sh
index 6fb561fa17..35a6847a40 100644
--- a/tests/images.sh
+++ b/tests/images.sh
@@ -24,6 +24,8 @@ $TEST_IMAGE_PREFIX/centos/stream9/upstream:latest
 $TEST_IMAGE_PREFIX/centos/stream10/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/42/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/43/upstream:latest
+$TEST_IMAGE_PREFIX/fedora/44/upstream:latest
+$TEST_IMAGE_PREFIX/fedora/45/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/rawhide/upstream:latest
 $TEST_IMAGE_PREFIX/fedora/eln/upstream:latest
 $TEST_IMAGE_PREFIX/ubi/8/upstream:latest
@@ -44,6 +46,7 @@ TEST_VIRTUAL_IMAGES="${TEST_VIRTUAL_IMAGES:-centos-stream-9
 centos-stream-10
 fedora-42
 fedora-43
+fedora-44
 fedora-rawhide
 fedora-coreos}"
 
@@ -55,6 +58,7 @@ TEST_VIRTUAL_IMAGES_SECONDARY="${TEST_VIRTUAL_IMAGES_SECONDARY:-fedora-42}"
 function is_fedora_rawhide () {
     [[ "$1" =~ ^.*fedora/rawhide[:/].* ]] && return 0
     [[ "$1" = "fedora-rawhide" ]] && return 0
+    [[ "$1" =~ ^.*fedora/45[:/].* ]] && return 0
 
     return 1
 }
@@ -80,6 +84,13 @@ function is_fedora_43 () {
     return 1
 }
 
+function is_fedora_44 () {
+    [[ "$1" =~ ^.*fedora/44[:/].* ]] && return 0
+    [[ "$1" = "fedora-44" ]] && return 0
+
+    return 1
+}
+
 function is_centos_stream_9 () {
     [[ "$1" =~ ^.*centos/stream9[:/].* ]] && return 0
     [[ "$1" = "centos-stream-9" ]] && return 0
diff --git a/tests/prepare/install/test.sh b/tests/prepare/install/test.sh
index 26da198678..74347a0e90 100755
--- a/tests/prepare/install/test.sh
+++ b/tests/prepare/install/test.sh
@@ -78,6 +78,10 @@ rlJournalStart
                 rlRun "distro=fedora-43"
                 rlRun "package_manager=dnf5"
 
+            elif is_fedora_44 "$image"; then
+                rlRun "distro=fedora-44"
+                rlRun "package_manager=dnf5"
+
             elif is_centos_stream_9 "$image"; then
                 rlRun "distro=centos-stream-9"
                 rlRun "package_manager=dnf"
@@ -251,16 +255,7 @@ rlJournalStart
                     rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
                 fi
 
-            elif is_fedora_coreos "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_rawhide "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_eln "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_43 "$image"; then
+            elif is_fedora "$image"; then
                 rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
 
             elif is_ubuntu "$image" || is_debian "$image"; then
@@ -292,16 +287,7 @@ rlJournalStart
                     rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
                 fi
 
-            elif is_fedora_coreos "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_rawhide "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_eln "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_43 "$image"; then
+            elif is_fedora "$image"; then
                 rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
 
             elif is_ubuntu "$image" || is_debian "$image"; then
@@ -333,16 +319,7 @@ rlJournalStart
                     rlAssertGrep "stderr: error: Packages not found: tree-but-spelled-wrong" $rlRun_LOG
                 fi
 
-            elif is_fedora_coreos "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_rawhide "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_eln "$image"; then
-                rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
-
-            elif is_fedora_43 "$image"; then
+            elif is_fedora "$image"; then
                 rlAssertGrep "stderr: No match for argument: tree-but-spelled-wrong" $rlRun_LOG
 
             elif is_ubuntu "$image" || is_debian "$image"; then