diff --git a/android/app/libs/google-services-4.1.0.jar b/android/app/libs/google-services-4.1.0.jar
new file mode 100644
index 0000000000..5035740863
Binary files /dev/null and b/android/app/libs/google-services-4.1.0.jar differ
diff --git a/android/app/libs/gradle-download-task-3.1.2.jar b/android/app/libs/gradle-download-task-3.1.2.jar
new file mode 100644
index 0000000000..efcd077e84
Binary files /dev/null and b/android/app/libs/gradle-download-task-3.1.2.jar differ
diff --git a/android/build.gradle b/android/build.gradle
index 52d44baef8..db86e7e9a4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,6 +2,7 @@
 
 buildscript {
     repositories {
+        flatDir { dirs "libs", "${rootDir}/app/libs" }
         google()
         jcenter()
     }
diff --git a/android/gradle.properties b/android/gradle.properties
index 6fada24744..9dc1c7204e 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -28,4 +28,4 @@ STATUS_RELEASE_KEY_PASSWORD=password
 # Workaround for issue https://github.com/facebook/react-native/issues/16906 (TODO: fixed in 0.57.3, remove once we upgrade react-native)
 android.enableAapt2=false
 
-org.gradle.jvmargs=-Xmx4608M
\ No newline at end of file
+org.gradle.jvmargs=-Xmx8704M
diff --git a/ci/mobile.groovy b/ci/mobile.groovy
index 854e79326e..c7601c9ef8 100644
--- a/ci/mobile.groovy
+++ b/ci/mobile.groovy
@@ -29,7 +29,7 @@ def podUpdate() {
     sh "touch ${lockFile}"
     sh 'pod update --silent --no-ansi'
   } finally {
-    sh "rm ${lockFile}"
+    sh "rm -f ${lockFile}"
   }
 }
 
diff --git a/modules/react-native-status/desktop/CMakeLists.txt b/modules/react-native-status/desktop/CMakeLists.txt
index 96db4d74cf..3801d594c6 100755
--- a/modules/react-native-status/desktop/CMakeLists.txt
+++ b/modules/react-native-status/desktop/CMakeLists.txt
@@ -28,19 +28,9 @@ set(CONFIGURE_SCRIPT build-status-go.sh)
 
 file(STRINGS "../../../STATUS_GO_VERSION" STATUS_GO_VERSION)
 
-# custom status-go builds are identified by '{date}-{time}-{commit}'
-if ("${STATUS_GO_VERSION}" MATCHES "[0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]-([0-9a-zA-Z]+)")
-  set(STATUS_GO_TAG ${CMAKE_MATCH_1})
-else()
-  set(STATUS_GO_TAG ${STATUS_GO_VERSION})
-endif()
-
 ExternalProject_Add(StatusGo_ep
   PREFIX ${StatusGo_PREFIX}
   SOURCE_DIR ${StatusGo_SOURCE_DIR}
-  GIT_REPOSITORY https://github.com/status-im/status-go.git
-  GIT_TAG ${STATUS_GO_TAG}
-  GIT_SHALLOW true
   URL https://status-go.ams3.digitaloceanspaces.com/status-go-desktop-${STATUS_GO_VERSION}.zip
       https://github.com/status-im/status-go/archive/${STATUS_GO_VERSION}.zip
   BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB}