diff --git a/scripts/upgrade b/scripts/upgrade
index aa53e19..d5f756d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -124,7 +124,9 @@ else
     # 1 - Clone stable repo 
     git clone https://github.com/friendica/friendica.git -b stable "$final_path"
     # Reset branch to the level of update we needed
-    git reset --hard $version_commit
+    pushd "$final_path"
+    	git reset --hard $version_commit
+    popd
     
     # Remove the addon directory securely
     ynh_secure_remove "$final_path/addon"
@@ -132,7 +134,9 @@ else
     # 2 - Clone addons repo 
     git clone https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" 
     # Reset addons branch to the level of update we needed
-    git reset --hard $addons_version_commit
+    pushd "$final_path/addon"
+    	git reset --hard $addons_version_commit
+    popd
     
     # Restore the smarty3 folder
     cp -a "$tmpdir/view/smarty3" "$final_path/view/smarty3"