diff --git a/tools/change_addon_version b/tools/change_addon_version
index 030981cd34..823a6c5191 100755
--- a/tools/change_addon_version
+++ b/tools/change_addon_version
@@ -21,6 +21,8 @@ update_addon_version() {
 
   echo "git commit \"distro: bump ADDON_VERSION to ${BUMP_ADDON_VERSION}\""
   git commit -qs -m "distro: bump ADDON_VERSION to ${BUMP_ADDON_VERSION}" "${DISTRIBUTION_PATH}"
+  # wait for slow fs otherwise lock errors at git
+  sync
 }
 
 update_package() {
@@ -37,6 +39,8 @@ update_package() {
   # commit changes
   # avoid errors at commit by checking if changes are available
   git diff --quiet HEAD $REF -- packages/addons || { echo "git commit \"addons: reset version\"" && git commit -qs -m "addons: reset version" "packages/addons"; }
+  # wait for slow fs otherwise lock errors at git
+  sync
 }
 
 update_binary_addons() {
@@ -50,6 +54,8 @@ update_binary_addons() {
   # commit changes
   # avoid errors at commit by checking if changes are available
   git diff --quiet HEAD $REF -- packages/mediacenter/kodi-binary-addons || { echo "git commit \"addons: bump kodi-binary-addons\"" && git commit -qs -m "addons: bump kodi-binary-addons" "packages/mediacenter/kodi-binary-addons"; }
+  # wait for slow fs otherwise lock errors at git
+  sync
 }
 
 # check if whiptail is installed and directly execute script when argument is supplied