diff --git a/scripts/restore b/scripts/restore
index 8a956fa..b240d4e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -95,9 +95,10 @@ ynh_install_ruby --ruby_version=$RUBY_VERSION
 #=================================================
 ynh_script_progression --message="Reinstall Bundle Gem..."
 
-(cd "$final_path"
-ynh_use_ruby
-ynh_gem install bundler)
+pushd "$final_path"
+	ynh_use_ruby
+	ynh_gem install bundler
+popd
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 56c94a7..2a90acf 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -263,14 +263,14 @@ then
 	# Set permissions to app files
 	chown -R $app: $final_path
 
-	(
-		cd "$final_path"
+	pushd "$final_path"
 		ynh_use_ruby
 		# Install bundler, a gems installer
 		ynh_gem install bundler
 		# Install without documentation
 		exec_as $app echo "gem: --no-ri --no-rdoc" >> "$final_path/.gemrc"
-	)
+	popd
+	
 	# Specific actions on ARM architecture
 	if [ -n "$(uname -m | grep arm)" ] ; then
 		# Define the platform specifically to retrieve binaries