diff --git a/.gitignore b/.gitignore
index c21e214d..03a8d7f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ app/google-services.json
 *.hprof
 app/build
 bin
+app/app/google-services.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bd7f080..42e4f670 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ build apk:
   stage: build
   image: ubuntu:18.04
   before_script:
-    - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk nodejs software-properties-common wget zipalign
+    - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk nodejs npm software-properties-common wget zipalign
     - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1)
   artifacts:
     paths:
@@ -23,8 +23,8 @@ build apk:
       wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
     - apt-get -y update && apt-get -y install yarn git-secret
     - git secret reveal
+    - npm install -g react-native-cli
     - git clone https://github.com/lbryio/lbry-react-native
-    - yarn global add react-native-cli
     - cd lbry-react-native
     - yarn
     - rm -rf android # temporary, should be a submodule init?
diff --git a/.gitmodules b/.gitmodules
index 0aedca49..8b137891 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1 @@
-[submodule "app"]
-	path = app
-	url = https://github.com/lbryio/lbry-react-native
+
diff --git a/.gitsecret/keys/random_seed b/.gitsecret/keys/random_seed
new file mode 100644
index 00000000..ee5310e6
Binary files /dev/null and b/.gitsecret/keys/random_seed differ
diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
index dba90436..0cf7f85f 100644
--- a/.gitsecret/paths/mapping.cfg
+++ b/.gitsecret/paths/mapping.cfg
@@ -1 +1 @@
-lbry-android.keystore:
+lbry-android.keystore:0d958c531870694624cc877ea98ca1c583485f8ebbb3a5acca58b1930c190d65
diff --git a/app b/app
deleted file mode 160000
index 19d3d8cd..00000000
--- a/app
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 19d3d8cd9486ae67f64dc3ed84959d3cce94d099
diff --git a/lbry-android.keystore.secret b/lbry-android.keystore.secret
index ae36c4be..d765c8bd 100644
Binary files a/lbry-android.keystore.secret and b/lbry-android.keystore.secret differ