diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/compute.pkglist b/xCAT-server-2.0/share/xcat/netboot/fedora/compute.pkglist
index 1a4cacd67..2d9057fd1 100644
--- a/xCAT-server-2.0/share/xcat/netboot/fedora/compute.pkglist
+++ b/xCAT-server-2.0/share/xcat/netboot/fedora/compute.pkglist
@@ -8,4 +8,4 @@ openssh-clients
 busybox-anaconda
 wget
 ntp
-vi
+vim-minimal
diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist b/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist
index fb61c87aa..f8d1fb6da 100644
--- a/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist
+++ b/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist
@@ -5,11 +5,10 @@ kernel
 openssh-server
 openssh-clients
 busybox-anaconda
-vi
+vim-minimal
 rpm
 bind
 bind-utils
-atftp
 ksh
 nfs-utils
 dhcp
diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/compute.pkglist b/xCAT-server-2.0/share/xcat/netboot/rh/compute.pkglist
index 1de26134d..ca882af69 100644
--- a/xCAT-server-2.0/share/xcat/netboot/rh/compute.pkglist
+++ b/xCAT-server-2.0/share/xcat/netboot/rh/compute.pkglist
@@ -7,5 +7,5 @@ openssh-server
 openssh-clients
 busybox-anaconda
 wget
-vi
+vim-minimal
 ntp
diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/service.pkglist b/xCAT-server-2.0/share/xcat/netboot/rh/service.pkglist
index 699d450f3..79cdc055d 100644
--- a/xCAT-server-2.0/share/xcat/netboot/rh/service.pkglist
+++ b/xCAT-server-2.0/share/xcat/netboot/rh/service.pkglist
@@ -5,11 +5,10 @@ kernel
 openssh-server
 openssh-clients
 busybox-anaconda
-vi
+vim-minimal
 rpm
 bind
 bind-utils
-atftp
 ksh
 nfs-utils
 dhcp