diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 951a710c..186f9655 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -96,7 +96,7 @@
 	<!-- F-Droid -->
 	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
 	<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
-	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
+	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="refs/tags/1.1" />
 <!-- END OF ADDITIONAL REPOS -->
 
 
diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 77536c37..6fdfbc32 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -79,7 +79,7 @@
 	<!-- F-Droid -->
 	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
 	<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
-	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
+	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="refs/tags/1.1" />
 <!-- END OF ADDITIONAL REPOS -->
 
 
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index a7618fd0..9ae902e8 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -77,7 +77,9 @@ export -f buildAll;
 
 patchWorkspace() {
 	source build/envsetup.sh;
-	repopick 205021 206123; #Cherry picks
+	repopick 205021 206123 211008; #Cherry picks
+	repopick -t o_asb_4-2018;
+	#repopick -t calendar-o;
 
 	source $scripts/Patch.sh;
 	source $scripts/Defaults.sh;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index a7515b49..835b9975 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -34,9 +34,6 @@
 #Generate firmware deblobber
 #mka firmware_deblobber
 
-#repopick -t o_asb_4-2018
-#repopick -t calendar-o
-
 #
 #START OF PREPRATION
 #