diff --git a/scripts/install b/scripts/install
index c50a19b..c4d58a1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -85,6 +85,8 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 ynh_script_progression --message="Setting up source files..."
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+git config --system --add safe.directory $final_path
+
 # Download, check integrity, uncompress and patch the source from app.src
 git clone $REPOSITORY $final_path --quiet
 pushd "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index 1ce4c5b..82687ef 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -81,6 +81,7 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	pushd "$final_path"
+		git config --system --add safe.directory $final_path
 		git checkout master
 		git pull --quiet
 		git checkout $COMMIT --quiet