diff --git a/rootfs-builder/centos/config.sh b/rootfs-builder/centos/config.sh
index 8c5cf749c3..5a1ba4ef26 100644
--- a/rootfs-builder/centos/config.sh
+++ b/rootfs-builder/centos/config.sh
@@ -9,7 +9,10 @@
 OS_VERSION=${OS_VERSION:-7}
 
 #Mandatory Packages that must be installed
-# systemd: An init system that will start kata-agent
 # iptables: Need by Kata agent
-# udevlib.so: Need by Kata agent
-PACKAGES="systemd iptables"
+PACKAGES="iptables"
+
+#Optional packages:
+# systemd: An init system that will start kata-agent if kata-agent
+#          itself is not configured as init process.
+[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
diff --git a/rootfs-builder/clearlinux/config.sh b/rootfs-builder/clearlinux/config.sh
index 4401ce2491..5872a3648f 100644
--- a/rootfs-builder/clearlinux/config.sh
+++ b/rootfs-builder/clearlinux/config.sh
@@ -5,4 +5,5 @@
 
 #Use "latest" to always pull the last Clear Linux Release
 OS_VERSION=${OS_VERSION:-latest}
-PACKAGES="systemd iptables-bin libudev0-shim"
+PACKAGES="iptables-bin libudev0-shim"
+[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
diff --git a/rootfs-builder/euleros/config.sh b/rootfs-builder/euleros/config.sh
index e3c627bfce..7785bb313d 100644
--- a/rootfs-builder/euleros/config.sh
+++ b/rootfs-builder/euleros/config.sh
@@ -9,7 +9,10 @@
 OS_VERSION=${OS_VERSION:-2.2}
 
 #Mandatory Packages that must be installed
-# systemd: An init system that will start kata-agent
 # iptables: Need by Kata agent
-# udevlib.so: Need by Kata agent
-PACKAGES="systemd iptables"
+PACKAGES="iptables"
+
+#Optional packages:
+# systemd: An init system that will start kata-agent if kata-agent
+#          itself is not configured as init process.
+[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
diff --git a/rootfs-builder/fedora/config.sh b/rootfs-builder/fedora/config.sh
index 58a51f491e..85bbf60a98 100644
--- a/rootfs-builder/fedora/config.sh
+++ b/rootfs-builder/fedora/config.sh
@@ -5,4 +5,5 @@
 
 #Fedora version to use
 OS_VERSION=${OS_VERSION:-27}
-PACKAGES="systemd iptables"
+PACKAGES="iptables"
+[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true