diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
index e7ffd6bb9..d7c88748f 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
@@ -1,6 +1,5 @@
 Ubuntu_diskless_installation_flat_x86_vm
 Ubuntu_full_installation_flat_x86_vm
-Full_installation_flat_docker
 makehosts_h
 makehosts_help
 makehosts_n_noderange
@@ -244,6 +243,7 @@ switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
 nodeset_check_warninginfo
+Full_installation_flat_docker
 rpower_stop
 rpower_start
 rpower_state
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
index eeab10ae7..7c70fa1b9 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
@@ -1,6 +1,5 @@
 Ubuntu_diskless_installation_flat_x86_vm
 Ubuntu_full_installation_flat_x86_vm
-Full_installation_flat_docker
 makehosts_h
 makehosts_help
 makehosts_n_noderange
@@ -244,6 +243,7 @@ switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
 nodeset_check_warninginfo
+Full_installation_flat_docker
 rpower_stop
 rpower_start
 rpower_state
@@ -256,4 +256,4 @@ rmdocker_h
 rmdocker_command
 rmdocker_f_command
 lsdocker_h_command
-lsdocker_l_command
\ No newline at end of file
+lsdocker_l_command
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
index 08f275336..a80535bae 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
@@ -1,6 +1,5 @@
 Ubuntu_diskless_installation_flat_x86_vm
 Ubuntu_full_installation_flat_x86_vm
-Full_installation_flat_docker
 makehosts_h
 makehosts_help
 makehosts_n_noderange
@@ -250,6 +249,7 @@ run_command_with_XCATBYPASS_systemd
 disable_root_permission_in_policy_table_systemd
 assign_certain_command_permission_systemd
 nodeset_check_warninginfo
+Full_installation_flat_docker
 rpower_stop
 rpower_start
 rpower_state
diff --git a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
index 11ea27fae..fe3665fb8 100644
--- a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
@@ -241,6 +241,7 @@ switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
 nodeset_check_warninginfo
+Full_installation_flat_docker
 rpower_stop
 rpower_start
 rpower_state
diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
index 732349b1e..20b2a754d 100644
--- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
+++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
@@ -1,54 +1,37 @@
 start:Full_installation_flat_docker
 os:Linux
-cmd:copycds $$ISO
+cmd:mkdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost -u profile=compute provmethod=install
 check:rc==0
-cmd:if [[ "__GETNODEATTR($$DOCKERHOST,arch)__" != "ppc64" ]];then rmvm $$DOCKERHOST -f  && chdef $$DOCKERHOST mac= && mkvm $$DOCKERHOST ; fi
+cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then  ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost  otherpkgdir="https://apt.dockerproject.org/repo ubuntu-trusty main,http://cz.archive.ubuntu.com/ubuntu trusty main" otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist" osdistroname="__GETNODEATTR($$CN,os)__ ";fi
 check:rc==0
-cmd:makehosts $$DOCKERHOST
+cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; mkdir -p /install/custom/ubuntu$ver/ ;  chdef -t osimage -o __GETNODEATTR($$DOCKERHOST,os)__-__GETNODEATTR($$DOCKERHOST,arch)__-install-dockerhost otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist"  pkglist="/install/custom/ubuntu$ver/ubuntu$ver.pkglist";fi 
 check:rc==0
-cmd:makedns -n
+cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ;for i in openssh-server ntp gawk nfs-common snmpd bridge-utils; do  cat /install/custom/ubuntu$ver/ubuntu$ver.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /install/custom/ubuntu$ver/ubuntu$ver.pkglist; fi done;fi
 check:rc==0
-cmd:sleep 60
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:makeconservercf $$DOCKERHOST
-check:rc==0
-cmd:cat /etc/conserver.cf | grep $$DOCKERHOST
-check:output=~$$DOCKERHOST
-cmd:  mkdef -t osimage -o __GETNODEATTR($$DOCKERHOST,os)__-__GETNODEATTR($$DOCKERHOST,arch)__-install-dockerhost -u profile=compute provmethod=install
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$DOCKERHOST,os)__" =~ "ubuntu" ]];then  ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; chdef -t osimage -o __GETNODEATTR($$DOCKERHOST,os)__-__GETNODEATTR($$DOCKERHOST,arch)__-install-dockerhost  otherpkgdir="https://apt.dockerproject.org/repo ubuntu-trusty main,http://cz.archive.ubuntu.com/ubuntu trusty main" otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist" osdistroname="__GETNODEATTR($$DOCKERHOST,os)__ ";fi
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$DOCKERHOST,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; mkdir -p /install/custom/ubuntu$ver/ ;  chdef -t osimage -o __GETNODEATTR($$DOCKERHOST,os)__-__GETNODEATTR($$DOCKERHOST,arch)__-install-dockerhost otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist"  pkglist="/install/custom/ubuntu$ver/ubuntu$ver.pkglist";fi 
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$DOCKERHOST,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ;for i in openssh-server ntp gawk nfs-common snmpd bridge-utils; do  cat /install/custom/ubuntu$ver/ubuntu$ver.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /install/custom/ubuntu$ver/ubuntu$ver.pkglist; fi done;fi
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$DOCKERHOST,os)__" =~ "ubuntu14.04" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'`; for i in docker-engine;do cat /install/custom/ubuntu$ver/ubuntu"$ver"\_docker.pkglist |grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /install/custom/ubuntu$ver/ubuntu"$ver"\_docker.pkglist;fi done;fi
+cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu14.04" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'`; for i in docker-engine;do cat /install/custom/ubuntu$ver/ubuntu"$ver"\_docker.pkglist |grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /install/custom/ubuntu$ver/ubuntu"$ver"\_docker.pkglist;fi done;fi
 check:rc==0 
-cmd: chdef $$DOCKERHOST -p postbootscripts="setupdockerhost mynet0=$$MYNET0VALUE@$$DOCKERHOSIP:$$NICNAME"
+cmd: chdef $$CN -p postbootscripts="setupdockerhost mynet0=$$MYNET0VALUE@$$DOCKERHOSIP:$$NICNAME"
 check:rc==0
-cmd:nodeset  $$DOCKERHOST osimage=__GETNODEATTR($$DOCKERHOST,os)__-__GETNODEATTR($$DOCKERHOST,arch)__-install-dockerhost
+cmd:nodeset  $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost
 check:rc==0
-cmd:rpower $$DOCKERHOST boot
+cmd:rpower $$CN boot
 check:rc==0
 cmd:sleep 40
-cmd:lsdef -l $$DOCKERHOST | grep status
+cmd:lsdef -l $$CN | grep status
 cmd:sleep 3600
 check:rc==0
-cmd:ping $$DOCKERHOST -c 3
-check:output=~64 bytes from $$DOCKERHOST
+cmd:ping $$CN -c 3
+check:output=~64 bytes from $$CN
 check:rc==0
-cmd:lsdef -l $$DOCKERHOST | grep status
+cmd:lsdef -l $$CN | grep status
 check:output=~booted
-cmd:xdsh $$DOCKERHOST date
+cmd:xdsh $$CN date
 check:rc==0
-cmd:xdsh $$DOCKERHOST "docker -v"
+cmd:xdsh $$CN "docker -v"
 check:output=~Docker version
 check:rc==0
-cmd:xdsh $$DOCKERHOST "docker pull $$DOCKERIMAGE"
+cmd:xdsh $$CN "docker pull $$DOCKERIMAGE"
 check:rc==0
-cmd:rmdef -t osimage -o __GETNODEATTR($$DOCKERHOST,os)__-__GETNODEATTR($$DOCKERHOST,arch)__-install-dockerhost
+cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost
 check:rc==0
 end