diff --git a/manifest.toml b/manifest.toml
index 06060b7..e08b34f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -37,6 +37,7 @@ ram.runtime = "50M"
     type = "user"
 
 [resources]
+<<<<<<< HEAD
     [resources.sources]
         [resources.sources.main]
         url = "https://codeberg.org/streams/streams/archive/8fb92b522b8bff562b350070b57954a998875e58.tar.gz"
@@ -45,6 +46,8 @@ ram.runtime = "50M"
         [resources.sources.addons]
         url = "https://codeberg.org/streams/streams-addons/archive/39b1c5af9f2b1c639b6438ac85b0ea85273fc201.tar.gz"
         sha256 = "5885665bf3dfbe843387184543be17b6b2061b807a57c1d6962548af80794f75"
+=======
+>>>>>>> d73fcb5 (Switch from tarball download to git clone for the install)
 
     [resources.ports]
 
diff --git a/scripts/install b/scripts/install
index 01fc235..a62f6c7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -45,9 +45,13 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-# Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir"
-ynh_setup_source --dest_dir="$install_dir/addon" --source_id="addons"
+mkdir -p "$install_dir"
+chown -R $app:www-data "$install_dir"
+
+git config --system --add safe.directory $install_dir
+
+# Download, check integrity, uncompress and patch the source from GitHub
+git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet
 
 touch "$install_dir/php.log"
 mkdir -p "$install_dir/store"