diff --git a/ChangeLog.md b/ChangeLog.md
index 2f292dc..454bd3a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -14,6 +14,8 @@
      * improve GApps removal mechanism
 * Full, microG packages
   * move microG GsfProxy from /system/priv-app to /system/app
+* Full package
+  * download Orbot and Orfox from Guardian Project F-Droid repo instead from the release mirror
 
 ### Updates
 
diff --git a/data/build-package.database b/data/build-package.database
index 7910a58..58001db 100644
--- a/data/build-package.database
+++ b/data/build-package.database
@@ -52,8 +52,8 @@ fd_SIMPLECALENDAR=(fdroid com.simplemobiletools.calendar app SimpleCalendar)
 fd_SIMPLEGALLERY=(fdroid com.simplemobiletools.gallery app SimpleGallery)
 fd_TERMUX=(fdroid com.termux app Termux)
 
-gd_ORBOT=(https://guardianproject.info/releases/orbot-latest.apk app Orbot)
-gd_ORFOX=(https://guardianproject.info/releases/Orfox-v1.5.1-RC1-Fennec-52.7.2esr-TorBrowser-7.5-1.apk app Orfox)
+gd_ORBOT=(guardian org.torproject.android app Orbot)
+gd_ORFOX=(guardian info.guardianproject.orfox app Orfox)
 
 gh_K9MAIL=(k9mail/k-9 app K9Mail)
 gh_MPV=(mpv-android/mpv-android app MPV)
diff --git a/data/build-package.update b/data/build-package.update
index 205f297..3d40d4f 100644
--- a/data/build-package.update
+++ b/data/build-package.update
@@ -66,11 +66,11 @@ update_apps () {
 	grab_apk_from_repo ${fd_SIMPLECALENDAR[@]}
 	grab_apk_from_repo ${fd_SIMPLEGALLERY[@]}
 	grab_apk_from_repo ${fd_TERMUX[@]}
+	grab_apk_from_repo ${gd_ORBOT[@]}
+	grab_apk_from_repo ${gd_ORFOX[@]}
 
 	# applications not managed in repositories
 	# plain URL
-	grab_apk_from_url ${gd_ORBOT[@]}
-	grab_apk_from_url ${gd_ORFOX[@]}
 	#grab_apk_from_url ${nlx_OPENLAUNCHER[@]}
 	grab_apk_from_url ${nlx_MPV[@]}