diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml
index 65a19b703..6ace48a22 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml
@@ -1,20 +1,20 @@
 osimage:
   test.environments.osimage:
     basic_attributes:
-      arch: OSARCH 
-      distribution: OSVERS 
-      osdistro: OSVERS-OSARCH 
+      arch: OSARCH
+      distribution: OSVERS
+      osdistro: OSVERS-OSARCH
       osname: Linux
     deprecated:
       comments:
-      - OSMAJOR 
+      - OSMAJOR
       - test_environment_variables
     filestosync:
     - '{{GITREPO}}/syncfiles/synclist'
     genimgoptions:
       permission: '755'
       postinstall:
-      - POSTINSTALL 
+      - POSTINSTALL
       - '{{GITREPO}}/postinstall/test1.postinstall'
       rootimgdir: /install/custom/{{OBJNAME}}
     imagetype: linux
@@ -26,10 +26,10 @@ osimage:
       - '{{GITREPO}}/otherpkglist/test2.otherpkglist'
       - ''
       pkgdir:
-      - PKGDIR 
+      - PKGDIR
       - '{{SWDIR}}/pkgdir/'
       pkglist:
-      - PKGLIST 
+      - PKGLIST
       - '{{GITREPO}}/pkglist/test1.pkglist'
       - '{{GITREPO}}/pkglist/test2.pkglist'
     provision_mode: netboot
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
index 38a1d0b28..adb23f662 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
@@ -1,20 +1,20 @@
 osimage:
   test.environments.osimage:
     basic_attributes:
-      arch: OSARCH 
-      distribution: OSMAJOR 
-      osdistro: OSVERS-OSARCH 
+      arch: OSARCH
+      distribution: OSMAJOR
+      osdistro: OSVERS-OSARCH
       osname: Linux
     filestosync: 
     - {{GITREPO}}/syncfiles/synclist
     deprecated:
       comments: 
-      - OSMAJOR 
+      - OSMAJOR
       - test_environment_variables
     genimgoptions:
       permission: '755'
       postinstall: 
-      - POSTINSTALL 
+      - POSTINSTALL
       - {{GITREPO}}/postinstall/test1.postinstall
       rootimgdir: /install/custom/{{OBJNAME}} 
     imagetype: linux
@@ -24,10 +24,10 @@ osimage:
       - {{GITREPO}}/otherpkglist/test1.otherpkglist
       - {{GITREPO}}/otherpkglist/test2.otherpkglist,
       pkgdir: 
-      - PKGDIR 
+      - PKGDIR
       - {{SWDIR}}/pkgdir/
       pkglist: 
-      - PKGLIST 
+      - PKGLIST
       - {{GITREPO}}/pkglist/test1.pkglist
       - {{GITREPO}}/pkglist/test2.pkglist
     provision_mode: netboot