diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh
index ccc051a..b1c4430 100755
--- a/system_setup/sync_client_software.sh
+++ b/system_setup/sync_client_software.sh
@@ -82,8 +82,6 @@ chmod ug+rwX,o=rX -R ${SYSCONFIGPATH}
 #Make all install.sh executable
 find ${SYSCONFIGPATH}/client_software -type f -name install.sh -exec chmod ug+x,o-x {} \;
 find ${SYSCONFIGPATH}/client_software -type f -name user_run.sh -exec chmod ugo+x {} \;
-find ${SYSCONFIGPATH}/client_software_cust -type f -name install.sh -exec chmod ug+x,o-x {} \;
-find ${SYSCONFIGPATH}/client_software_cust -type f -name user_run.sh -exec chmod ugo+x {} \;
 
 # At first, sync central configs if they are configured to be synced
 if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then
@@ -206,9 +204,21 @@ else
   fi
   echo
 
+  # After Snc NC is not able to set permission the right way (like execution flag)
+  # So this need to be done again for new files coming in via sync
+  # we do it either with or without sync for better safety
+  chown root:${CLIENTADMINGROUP} -R ${SYSCONFIGPATH}
+  chmod ug+rwX,o=rX -R ${SYSCONFIGPATH}
+
+  #Make all install.sh executable
+  find ${SYSCONFIGPATH}/client_software -type f -name install.sh -exec chmod ug+x,o-x {} \;
+  find ${SYSCONFIGPATH}/client_software -type f -name user_run.sh -exec chmod ugo+x {} \;
+  find ${SYSCONFIGPATH}/client_software_cust -type f -name install.sh -exec chmod ug+x,o-x {} \;
+  find ${SYSCONFIGPATH}/client_software_cust -type f -name user_run.sh -exec chmod ugo+x {} \;
+
   #Run customer setup
   if [ ! -z "${CLIENT_SOFTWARE_CUST_DST}" ]; then
-    echo "Running company install scripts in user- context."
+    echo "Running company install scripts in admin- context."
     for DIR in $(ls -d ${CLIENT_SOFTWARE_CUST_DST}/*/ | sort); do
       DIR=${DIR%*/}      # remove the trailing "/"
       if [[ "$2." != "." ]] && [[ "${DIR}" != *"$2"* ]]; then
@@ -231,7 +241,7 @@ else
         echo " ===================="
       fi
     done
-    echo "Done running company install scripts in user- context."
+    echo "Done running company install scripts in admin- context."
   fi
 fi
 
@@ -239,6 +249,6 @@ fi
 echo "Removing unused Flatpak- Data."
 flatpak uninstall --unused -y
 
-echo "Sucessfully installed software."
+echo "Done running install scripts in admin- context."
 echo ""
 exit 0