diff --git a/build-utils/unsignedrpms.sh b/build-utils/unsignedrpms.sh
index 91d1f83c71..a4321bc859 100755
--- a/build-utils/unsignedrpms.sh
+++ b/build-utils/unsignedrpms.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # Check if the given rpm is not signed, and display its file name if not signed.
 # This would normally be run from find, e.g.: find . -type f -name '*.rpm' -exec ~/unsignedrpms.sh {} \;
 
diff --git a/docs/source/advanced/index.rst b/docs/source/advanced/index.rst
old mode 100755
new mode 100644
diff --git a/docs/source/developers/guides/code/code_standard.rst b/docs/source/developers/guides/code/code_standard.rst
index ccab7f79ad..f703787f2f 100644
--- a/docs/source/developers/guides/code/code_standard.rst
+++ b/docs/source/developers/guides/code/code_standard.rst
@@ -30,7 +30,7 @@ Code Standard Example:
 
 ::
 
-    #! /usr/bin/perl
+    #!/usr/bin/perl
 
     # This is a perl program example to demo the recommended
     # style to write perl code
diff --git a/perl-xCAT/xCAT/CIMUtils.pm b/perl-xCAT/xCAT/CIMUtils.pm
index 749d81ec03..54d66d181d 100644
--- a/perl-xCAT/xCAT/CIMUtils.pm
+++ b/perl-xCAT/xCAT/CIMUtils.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl
+#!/usr/bin/env perl
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # This package offers subroutines to access CIM server
diff --git a/perl-xCAT/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/InstUtils.pm b/perl-xCAT/xCAT/InstUtils.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/LparNetbootExp.pm b/perl-xCAT/xCAT/LparNetbootExp.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/RemoteShellExp.pm b/perl-xCAT/xCAT/RemoteShellExp.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/SLP.pm b/perl-xCAT/xCAT/SLP.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/SPD.pm b/perl-xCAT/xCAT/SPD.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/ServiceNodeUtils.pm b/perl-xCAT/xCAT/ServiceNodeUtils.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/TableUtils.pm b/perl-xCAT/xCAT/TableUtils.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm
old mode 100755
new mode 100644
diff --git a/perl-xCAT/xCAT/data/ibmhwtypes.pm b/perl-xCAT/xCAT/data/ibmhwtypes.pm
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers.rhels6.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers.rhels6.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/min-compilers.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/min-compilers.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/min-compilers.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/min-compilers.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/min-gpfs.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/min-gpfs.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/min-gpfs.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/min-gpfs.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/min-loadl.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/min-loadl.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/min-loadl.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/min-loadl.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.ppc64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh
index f3024fc394..909c185195 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 # Checkpoint/Restart related environment setup
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/min-pe.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/min-pe.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/litefile.csv b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/litefile.csv
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.pkglist
old mode 100755
new mode 100644
diff --git a/xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm b/xCAT-OpenStack/lib/perl/xCAT_schema/Clouds.pm
old mode 100755
new mode 100644
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/post.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/post.sh
index 2fa3d84e1a..b71635020d 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/post.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/post.sh
@@ -1,3 +1,3 @@
-
+#!/bin/sh
 echo "running sample-comp1 post script"
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postun.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postun.sh
index a5596e931d..78a290b213 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postun.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postun.sh
@@ -1,3 +1,3 @@
-
+#!/bin/sh
 echo "running sample-comp1 postun script"
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postup.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postup.sh
index a4ad3c5004..01fb7acf0f 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postup.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/postup.sh
@@ -1,3 +1,3 @@
-
+#!/bin/sh
 echo "running sample-comp1 postup script"
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/pre.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/pre.sh
index 36a88c9700..132319630b 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/pre.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/pre.sh
@@ -1,3 +1,3 @@
-
+#!/bin/sh
 echo "running sample-comp1 pre script"
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preun.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preun.sh
index e94c3aa8ef..5f407810ac 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preun.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preun.sh
@@ -1,3 +1,3 @@
-
+#!/bin/sh
 echo "running sample-comp1 preun script"
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preup.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preup.sh
index bf22484966..0aee81c296 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preup.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/preup.sh
@@ -1,3 +1,3 @@
-
+#!/bin/sh
 echo "running sample-comp1 preup script"
 
diff --git a/xCAT-client/pods/man1/lsslp.1.pod b/xCAT-client/pods/man1/lsslp.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-client/pods/man1/makentp.1.pod b/xCAT-client/pods/man1/makentp.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-client/pods/man1/monshow.1.pod b/xCAT-client/pods/man1/monshow.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-client/pods/man1/nodediscoverstart.1.pod b/xCAT-client/pods/man1/nodediscoverstart.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-client/pods/man1/switchdiscover.1.pod b/xCAT-client/pods/man1/switchdiscover.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index b0bc336b48..0c852ea9a1 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Build the xCAT-genesis-base rpm on a host system.
 # Option 1:  install the xCAT-genesis-builder rpm (that includes this file) on a system installed with
 #            the distro you want to use to build xCAT-genesis-base.
diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 0f2e76af9b..9fe40ba505 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # 2013.02.07 Brian Elliott Finley <bfinley@us.ibm.com>
 #   - Added slash in front of "var" in the NICSTOBRINGUP dhclient section.
diff --git a/xCAT-genesis-scripts/usr/bin/ifup b/xCAT-genesis-scripts/usr/bin/ifup
index e5d7491e52..6a74b84db4 100755
--- a/xCAT-genesis-scripts/usr/bin/ifup
+++ b/xCAT-genesis-scripts/usr/bin/ifup
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ "${1%?}" = "usb" ]; then
 	/sbin/setupimmnic
 fi
diff --git a/xCAT-genesis-scripts/usr/bin/restart b/xCAT-genesis-scripts/usr/bin/restart
index d27c9f832a..f5e79af3c2 100755
--- a/xCAT-genesis-scripts/usr/bin/restart
+++ b/xCAT-genesis-scripts/usr/bin/restart
@@ -1,3 +1,4 @@
+#!/bin/bash
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 #Redhcp, do the xcat part again
 FORCENICS=`cat /restart|awk '{print $2}'`
diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
old mode 100755
new mode 100644
diff --git a/xCAT-probe/subcmds/clusterstatus b/xCAT-probe/subcmds/clusterstatus
index f04955c3a8..3740dd5800 100755
--- a/xCAT-probe/subcmds/clusterstatus
+++ b/xCAT-probe/subcmds/clusterstatus
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
diff --git a/xCAT-probe/subcmds/image b/xCAT-probe/subcmds/image
index dd9fea9f08..3d78de0226 100755
--- a/xCAT-probe/subcmds/image
+++ b/xCAT-probe/subcmds/image
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
diff --git a/xCAT-probe/subcmds/nodecheck b/xCAT-probe/subcmds/nodecheck
index 537845d7b5..b8ab2b9f65 100755
--- a/xCAT-probe/subcmds/nodecheck
+++ b/xCAT-probe/subcmds/nodecheck
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
diff --git a/xCAT-probe/subcmds/osdeploy b/xCAT-probe/subcmds/osdeploy
index a34869a095..acedf9229c 100755
--- a/xCAT-probe/subcmds/osdeploy
+++ b/xCAT-probe/subcmds/osdeploy
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
diff --git a/xCAT-probe/subcmds/osimagecheck b/xCAT-probe/subcmds/osimagecheck
index 7acfd16a7c..0708d6c02d 100755
--- a/xCAT-probe/subcmds/osimagecheck
+++ b/xCAT-probe/subcmds/osimagecheck
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
diff --git a/xCAT-probe/subcmds/switch_macmap b/xCAT-probe/subcmds/switch_macmap
index ef4db81bc8..97e8f23a5d 100755
--- a/xCAT-probe/subcmds/switch_macmap
+++ b/xCAT-probe/subcmds/switch_macmap
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
 BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
 
diff --git a/xCAT-rmc/plugin/rmcmetrix.pm b/xCAT-rmc/plugin/rmcmetrix.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/monitoring/gangliamon.pm b/xCAT-server/lib/xcat/monitoring/gangliamon.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/monitoring/rrdutil.pm b/xCAT-server/lib/xcat/monitoring/rrdutil.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/docker.pm b/xCAT-server/lib/xcat/plugins/docker.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/hpblade.pm b/xCAT-server/lib/xcat/plugins/hpblade.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/hpilo.pm b/xCAT-server/lib/xcat/plugins/hpilo.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/imgcapture.pm b/xCAT-server/lib/xcat/plugins/imgcapture.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/makentp.pm b/xCAT-server/lib/xcat/plugins/makentp.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
old mode 100755
new mode 100644
diff --git a/xCAT-server/sbin/proxydhcp-xcat b/xCAT-server/sbin/proxydhcp-xcat
index f3c9ea2975..a37f27259d 100755
--- a/xCAT-server/sbin/proxydhcp-xcat
+++ b/xCAT-server/sbin/proxydhcp-xcat
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 # This program will start a proxydhcp daemon to handle 4011 request
 
diff --git a/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall b/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall
index 28e25dcb54..46194675a2 100755
--- a/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall
+++ b/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall
@@ -1,3 +1,4 @@
+#!/bin/sh
 # Sample script for diskless image changes for IB support
 #  Invoke this script from your
 #  /install/custom/netboot/<os>/<arch>/<profile>.postinstall script as:
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.exlist b/xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles11.x86_64.exlist b/xCAT-server/share/xcat/netboot/sles/compute.sles11.x86_64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.exlist b/xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.exlist b/xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.exlist b/xCAT-server/share/xcat/netboot/ubuntu/compute.exlist
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/windows/detectefi.cpp b/xCAT-server/share/xcat/netboot/windows/detectefi.cpp
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/netboot/windows/getnextserver.cpp b/xCAT-server/share/xcat/netboot/windows/getnextserver.cpp
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/scripts/createdb.sql b/xCAT-server/share/xcat/scripts/createdb.sql
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/scripts/updateDBM.sql b/xCAT-server/share/xcat/scripts/updateDBM.sql
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/tools/detect_dhcpd b/xCAT-server/share/xcat/tools/detect_dhcpd
index 7003dc2977..a92c3c5f74 100755
--- a/xCAT-server/share/xcat/tools/detect_dhcpd
+++ b/xCAT-server/share/xcat/tools/detect_dhcpd
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 use IO::Socket::INET;
 use Time::HiRes qw(gettimeofday sleep);
 use Getopt::Long;
diff --git a/xCAT-server/share/xcat/tools/powervm/vios.conf b/xCAT-server/share/xcat/tools/powervm/vios.conf
old mode 100755
new mode 100644
diff --git a/xCAT-server/share/xcat/tools/xcatstat b/xCAT-server/share/xcat/tools/xcatstat
index 75b0dbf904..56304b6075 100755
--- a/xCAT-server/share/xcat/tools/xcatstat
+++ b/xCAT-server/share/xcat/tools/xcatstat
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl
+#!/usr/bin/env perl
 
 # This script calls xCAT command 'nodestat' and 'xdsh' to
 # implement a status monitoring tool like CSM command 'csmstat
diff --git a/xCAT-server/xCAT-wsapi/genrestapidoc.pm b/xCAT-server/xCAT-wsapi/genrestapidoc.pm
old mode 100755
new mode 100644
index eb01e90194..65b8955e85
--- a/xCAT-server/xCAT-wsapi/genrestapidoc.pm
+++ b/xCAT-server/xCAT-wsapi/genrestapidoc.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 package genrestapidoc;
 
diff --git a/xCAT-server/xCAT-wsapi/xcatws-test.sh b/xCAT-server/xCAT-wsapi/xcatws-test.sh
index 246c5743c6..47d070218b 100755
--- a/xCAT-server/xCAT-wsapi/xcatws-test.sh
+++ b/xCAT-server/xCAT-wsapi/xcatws-test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 
 # Get all the parameters
diff --git a/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test2.postinstall b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test2.postinstall
index 45f8697f72..f950b6dc6e 100755
--- a/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test2.postinstall
+++ b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test2.postinstall
@@ -1,3 +1,4 @@
+#!/bin/sh
 #Test for postinstall script
 installroot=$1
 echo "test postisntall" >> $installroot/tmp/test2.postinstall
diff --git a/xCAT-vlan/pods/man1/chvlan.1.pod b/xCAT-vlan/pods/man1/chvlan.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/pods/man1/chvlanports.1.pod b/xCAT-vlan/pods/man1/chvlanports.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/pods/man1/lsvlan.1.pod b/xCAT-vlan/pods/man1/lsvlan.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/pods/man1/mkvlan.1.pod b/xCAT-vlan/pods/man1/mkvlan.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/pods/man1/rmvlan.1.pod b/xCAT-vlan/pods/man1/rmvlan.1.pod
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/xCAT-vlan.spec b/xCAT-vlan/xCAT-vlan.spec
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/xCAT/SwitchHandler.pm b/xCAT-vlan/xCAT/SwitchHandler.pm
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/xCAT_plugin/vlan.pm b/xCAT-vlan/xCAT_plugin/vlan.pm
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/xCAT_plugin/vlan/BNTSwitch.pm b/xCAT-vlan/xCAT_plugin/vlan/BNTSwitch.pm
old mode 100755
new mode 100644
diff --git a/xCAT-vlan/xCAT_plugin/vlan/CiscoSwitch.pm b/xCAT-vlan/xCAT_plugin/vlan/CiscoSwitch.pm
old mode 100755
new mode 100644
diff --git a/xCAT/postscripts/configbond b/xCAT/postscripts/configbond
index 9903b99027..af5a921e80 100755
--- a/xCAT/postscripts/configbond
+++ b/xCAT/postscripts/configbond
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # Usage:
diff --git a/xCAT/postscripts/upflag/upflag.cpp b/xCAT/postscripts/upflag/upflag.cpp
old mode 100755
new mode 100644