diff --git a/app/build.gradle b/app/build.gradle
index c7f0e3cabd..658ca952d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,7 +156,8 @@ android {
     // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
     packagingOptions {
         resources {
-            excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE']
+            excludes += 'META-INF/LICENSE*'
+            pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
         }
     }
 
diff --git a/build.gradle b/build.gradle
index 3198bb07d0..d667e43a2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         androidLibraryVersion = "master-SNAPSHOT"
         mockitoVersion = "4.8.0"
         mockitoKotlinVersion = "4.0.0"
-        mockkVersion = "1.12.5"
+        mockkVersion = "1.13.2"
         espressoVersion = "3.4.0"
         workRuntime = "2.7.1"
         fidoVersion = "4.1.0"