diff --git a/dnf_systemd.dockerfile b/dnf_systemd.dockerfile
new file mode 100644
index 0000000..3d7982a
--- /dev/null
+++ b/dnf_systemd.dockerfile
@@ -0,0 +1,25 @@
+ARG BASE_IMAGE_TAG
+ARG OS_TYPE
+
+FROM $OS_TYPE:$BASE_IMAGE_TAG
+
+ENV container docker
+
+RUN echo "LC_ALL=en_US.utf-8" >> /etc/locale.conf
+
+RUN dnf -y install openssh-server openssh-clients systemd initscripts glibc-langpack-en iproute ; \
+    dnf -y reinstall dbus ; \
+    dnf clean all
+
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*;\
+rm -f /etc/systemd/system/*.wants/*;\
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*;\
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+STOPSIGNAL SIGRTMIN+3
+
+CMD ["/lib/systemd/systemd"]
diff --git a/images.json b/images.json
index 274ca78..960759b 100644
--- a/images.json
+++ b/images.json
@@ -6,25 +6,25 @@
     { "image": "centos",          "tag": "6",       "dockerfile": "yum_initd",          "platforms": ["amd64"],             "base_image": "centos",                "base_tag": "6" },
     { "image": "centos",          "tag": "7",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "centos",                "base_tag": "7" },
     { "image": "centos",          "tag": "stream8", "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "quay.io/centos/centos", "base_tag": "stream8" },
-    { "image": "centos",          "tag": "stream9", "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "quay.io/centos/centos", "base_tag": "stream9" },
+    { "image": "centos",          "tag": "stream9", "dockerfile": "dnf_systemd",        "platforms": ["amd64"],             "base_image": "quay.io/centos/centos", "base_tag": "stream9" },
     { "image": "sles",            "tag": "15",      "dockerfile": "zypper_systemd",     "platforms": ["amd64"],             "base_image": "registry.suse.com/suse/sle15", "base_tag": "15.5" },
     { "image": "scientificlinux", "tag": "6",       "dockerfile": "yum_initd",          "platforms": ["amd64"],             "base_image": "scientificlinux/sl",    "base_tag": "6" },
     { "image": "scientificlinux", "tag": "7",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "scientificlinux/sl",    "base_tag": "7" },
     { "image": "oraclelinux",     "tag": "6",       "dockerfile": "yum_initd",          "platforms": ["amd64"],             "base_image": "oraclelinux",           "base_tag": "6" },
     { "image": "oraclelinux",     "tag": "7",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "oraclelinux",           "base_tag": "7" },
     { "image": "oraclelinux",     "tag": "8",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "oraclelinux",           "base_tag": "8" },
-    { "image": "oraclelinux",     "tag": "9",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "oraclelinux",           "base_tag": "9" },
+    { "image": "oraclelinux",     "tag": "9",       "dockerfile": "dnf_systemd",        "platforms": ["amd64"],             "base_image": "oraclelinux",           "base_tag": "9" },
     { "image": "rockylinux",      "tag": "8",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "rockylinux/rockylinux", "base_tag": "8" },
-    { "image": "rockylinux",      "tag": "9",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "rockylinux/rockylinux", "base_tag": "9" },
+    { "image": "rockylinux",      "tag": "9",       "dockerfile": "dnf_systemd",        "platforms": ["amd64"],             "base_image": "rockylinux/rockylinux", "base_tag": "9" },
     { "image": "almalinux",       "tag": "8",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "almalinux",             "base_tag": "8" },
-    { "image": "almalinux",       "tag": "9",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "almalinux",             "base_tag": "9" },
+    { "image": "almalinux",       "tag": "9",       "dockerfile": "dnf_systemd",        "platforms": ["amd64"],             "base_image": "almalinux",             "base_tag": "9" },
     { "image": "redhat",          "tag": "7",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "registry.access.redhat.com/ubi7/ubi", "base_tag": "latest" },
     { "image": "redhat",          "tag": "8",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "redhat/ubi8",           "base_tag": "latest" },
-    { "image": "redhat",          "tag": "9",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "redhat/ubi9",           "base_tag": "latest" },
+    { "image": "redhat",          "tag": "9",       "dockerfile": "dnf_systemd",        "platforms": ["amd64"],             "base_image": "redhat/ubi9",           "base_tag": "latest" },
     { "image": "debian",          "tag": "10",      "dockerfile": "apt_sysvinit-utils", "platforms": ["amd64"],             "base_image": "debian",                "base_tag": "10" },
     { "image": "debian",          "tag": "11",      "dockerfile": "apt_sysvinit-utils", "platforms": ["amd64", "arm64/v8"], "base_image": "debian",                "base_tag": "bullseye" },
     { "image": "debian",          "tag": "12",      "dockerfile": "apt_sysvinit-utils", "platforms": ["amd64", "arm64/v8"], "base_image": "debian",                "base_tag": "12" },
     { "image": "amazonlinux",     "tag": "2023",    "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "amazonlinux",           "base_tag": "2023" },
     { "image": "amazonlinux",     "tag": "2",       "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "amazonlinux",           "base_tag": "2" },
-    { "image": "fedora",          "tag": "36",      "dockerfile": "yum_systemd",        "platforms": ["amd64"],             "base_image": "fedora",                "base_tag": "36" }
+    { "image": "fedora",          "tag": "36",      "dockerfile": "dnf_systemd",        "platforms": ["amd64"],             "base_image": "fedora",                "base_tag": "36" }
 ]