diff --git a/.gitmodules b/.gitmodules
index 393a652c..f3a2516e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "msa-auth-for-android"]
-	path = msa-auth-for-android
+	path = lib/msa-auth-for-android
 	url = https://github.com/SailReal/msa-auth-for-android.git
 [submodule "subsampling-scale-image-view"]
-	path = subsampling-scale-image-view
+	path = lib/subsampling-scale-image-view
 	url = https://github.com/SailReal/subsampling-scale-image-view.git
 [submodule "pcloud-sdk-java"]
-	path = pcloud-sdk-java
-	url = https://github.com/SailReal/pcloud-sdk-java
+	path = lib/pcloud-sdk-java
+	url = https://github.com/SailReal/pcloud-sdk-java.git
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 16b33dfd..65b6cf64 100755
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/msa-auth-for-android" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/pcloud-sdk-java" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/subsampling-scale-image-view" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/lib/msa-auth-for-android" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/lib/pcloud-sdk-java" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/lib/subsampling-scale-image-view" vcs="Git" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index b2e35d60..629e0e7b 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -54,9 +54,14 @@ ext {
 
 	dropboxVersion = '4.0.1'
 
-	googleApiServicesVersion = 'v3-rev20210725-1.32.1'
+	googleApiServicesVersion = 'v3-rev20210919-1.32.1'
 	googlePlayServicesVersion = '19.2.0'
-	googleClientVersion = '1.32.1'
+	googleClientVersion = '1.32.1' // keep in sync with https://github.com/SailReal/google-http-java-client
+	/*
+		update using https://github.com/SailReal/google-http-java-client with `mvn clean install`,
+		copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
+	 */
+	trackingFreeGoogleCLientVersion = '1.40.1'
 
 	msgraphVersion = '2.10.0'
 
@@ -119,6 +124,8 @@ ext {
 			googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}",
 			googleApiServicesDrive: "com.google.apis:google-api-services-drive:${googleApiServicesVersion}",
 			googlePlayServicesAuth: "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}",
+			trackingFreeGoogleCLient       : files("lib/google-http-client-${trackingFreeGoogleCLientVersion}.jar"),
+			trackingFreeGoogleAndroidCLient: files("lib/google-http-client-android-${trackingFreeGoogleCLientVersion}.jar"),
 			greenDao              : "org.greenrobot:greendao:${greenDaoVersion}",
 			gson                  : "com.google.code.gson:gson:${gsonVersion}",
 			hamcrest              : "org.hamcrest:hamcrest-all:${hamcrestVersion}",
diff --git a/data/build.gradle b/data/build.gradle
index a3a6bfc2..270021d7 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -120,27 +120,54 @@ dependencies {
 	implementation dependencies.stax
 	api dependencies.minIo
 
-	playstoreImplementation dependencies.googlePlayServicesAuth
-	apkstoreImplementation dependencies.googlePlayServicesAuth
+	playstoreImplementation(dependencies.googlePlayServicesAuth) {
+		exclude module: 'guava-jdk5'
+		exclude module: 'httpclient'
+		exclude module: 'googlehttpclient'
+		exclude group: "com.google.http-client", module: "google-http-client"
+	}
+	apkstoreImplementation(dependencies.googlePlayServicesAuth) {
+		exclude module: 'guava-jdk5'
+		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+	}
 
 	playstoreImplementation(dependencies.googleApiServicesDrive) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: 'googlehttpclient'
+		exclude group: "com.google.http-client", module: "google-http-client"
 	}
 	apkstoreImplementation(dependencies.googleApiServicesDrive) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
 	}
 
 	playstoreImplementation(dependencies.googleApiClientAndroid) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude module: "jetified-google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+		exclude group: "com.google.http-client", module: "jetified-google-http-client"
 	}
 	apkstoreImplementation(dependencies.googleApiClientAndroid) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude module: "jetified-google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+		exclude group: "com.google.http-client", module: "jetified-google-http-client"
 	}
 
+	playstoreImplementation dependencies.trackingFreeGoogleCLient
+	apkstoreImplementation dependencies.trackingFreeGoogleCLient
+	playstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
+	apkstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
+
 	// rest
 	implementation dependencies.rxJava
 	implementation dependencies.rxAndroid
diff --git a/lib/google-http-client-1.40.1.jar b/lib/google-http-client-1.40.1.jar
new file mode 100644
index 00000000..175ee6fc
Binary files /dev/null and b/lib/google-http-client-1.40.1.jar differ
diff --git a/lib/google-http-client-android-1.40.1.jar b/lib/google-http-client-android-1.40.1.jar
new file mode 100644
index 00000000..5ce9a8e1
Binary files /dev/null and b/lib/google-http-client-android-1.40.1.jar differ
diff --git a/msa-auth-for-android b/lib/msa-auth-for-android
similarity index 100%
rename from msa-auth-for-android
rename to lib/msa-auth-for-android
diff --git a/pcloud-sdk-java b/lib/pcloud-sdk-java
similarity index 100%
rename from pcloud-sdk-java
rename to lib/pcloud-sdk-java
diff --git a/subsampling-scale-image-view b/lib/subsampling-scale-image-view
similarity index 100%
rename from subsampling-scale-image-view
rename to lib/subsampling-scale-image-view
diff --git a/presentation/build.gradle b/presentation/build.gradle
index d54340b2..523dd3b6 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -149,21 +149,37 @@ dependencies {
 	playstoreImplementation(dependencies.googleApiServicesDrive) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: 'googlehttpclient'
+		exclude group: "com.google.http-client", module: "google-http-client"
 	}
 	apkstoreImplementation(dependencies.googleApiServicesDrive) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude group: "com.google.http-client", module: "google-http-client"
 	}
 
 	playstoreImplementation(dependencies.googleApiClientAndroid) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude module: "jetified-google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+		exclude group: "com.google.http-client", module: "jetified-google-http-client"
 	}
 	apkstoreImplementation(dependencies.googleApiClientAndroid) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude module: "jetified-google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+		exclude group: "com.google.http-client", module: "jetified-google-http-client"
 	}
 
+	playstoreImplementation dependencies.trackingFreeGoogleCLient
+	apkstoreImplementation dependencies.trackingFreeGoogleCLient
+	playstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
+	apkstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
+
 	// rest
 	implementation dependencies.rxJava
 	implementation dependencies.rxAndroid
diff --git a/settings.gradle b/settings.gradle
index 950d766e..6398dc17 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,8 @@
-include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':subsampling-image-view', ':msa-auth-for-android', ':pcloud-sdk-java-root', ':pcloud-sdk-java'
-project(':subsampling-image-view').projectDir = file(new File(rootDir, 'subsampling-scale-image-view/library'))
-project(':pcloud-sdk-java-root').projectDir = file(new File(rootDir, 'pcloud-sdk-java'))
-project(':pcloud-sdk-java').projectDir = file(new File(rootDir, 'pcloud-sdk-java/java-core'))
+include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':msa-auth-for-android', ':pcloud-sdk-java-root', ':pcloud-sdk-java', ':subsampling-image-view'
+
+var libFolder = new File(rootDir, 'lib')
+
+project(':msa-auth-for-android').projectDir = file(new File(libFolder, 'msa-auth-for-android'))
+project(':pcloud-sdk-java-root').projectDir = file(new File(libFolder, 'pcloud-sdk-java'))
+project(':pcloud-sdk-java').projectDir = file(new File(libFolder, 'pcloud-sdk-java/java-core'))
+project(':subsampling-image-view').projectDir = file(new File(libFolder, 'subsampling-scale-image-view/library'))