diff --git a/scripts/install b/scripts/install
index 003e705..1675a31 100755
--- a/scripts/install
+++ b/scripts/install
@@ -60,6 +60,10 @@ mkdir -p  "$install_dir/cache/smarty3"
 chmod -R o-rwx "$install_dir"
 chmod -R 775 $install_dir/store $install_dir/cache
 
+# Remember we use git clone to fetch code
+ynh_app_setting_set --app=$app --key=git_clone --value=1
+ynh_script_progression --message="We set git_clone value to $git_clone"
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index aca9fd9..aef2bb7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -16,6 +16,8 @@ ynh_script_progression --message="Loading settings..." --weight=1
 
 email=$(ynh_user_get_info --username=$admin --key=mail)
 
+ynh_app_setting_get --app=$app --key=git_clone
+
 #=================================================
 # CHECK VERSION
 #=================================================
@@ -56,8 +58,34 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="store/ .htconfig.php php.log"
+	# ynh_setup_source --dest_dir="$install_dir" --keep="store/ .htconfig.php php.log"
 
+    # First we save what we need to keep
+    mv $install_dir/store $data_dir/
+    mv $install_dir/cache $data_dir/
+    mv $install_dir/php.log $data_dir/
+
+    # Then we remove the previous install
+    ynh_secure_remove $install_dir
+
+    # We make the install cloning the repo
+    mkdir -p "$install_dir"
+    chown -R $app:www-data "$install_dir"
+
+    git config --system --add safe.directory $install_dir
+
+    git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet
+
+    # We restore what we previously saved
+    mv $data_dir/store $install_dir/
+    mv $data_dir/cache $install_dir/
+    mv $data_dir/php.log $install_dir/
+
+    chmod -R o-rwx "$install_dir"
+    chmod -R 775 $install_dir/store $install_dir/cache
+
+    # We add a little something to remember we now use git clone to fetch the app code
+    ynh_app_setting_set --app=$app --key=git_clone --value=1
 fi
 
 mkdir -p "$install_dir/store"