diff --git a/js/packages/berty-app/Makefile b/js/packages/berty-app/Makefile
index f1b60a9320..f7e7e1879b 100644
--- a/js/packages/berty-app/Makefile
+++ b/js/packages/berty-app/Makefile
@@ -46,7 +46,7 @@ $(PWD)/ios/Podfile: $(PWD)/node_modules
 	cat $< > $@
 
 deps.android: export PWD := $(PWD)
-deps.android: deps $(PWD)/node_modules/react-native/react.gradle.orig
+deps.android: deps $(PWD)/node_modules/react-native/react.gradle.orig $(if $(filter $(config), development), $(HOME)/.android/debug.keystore)
 
 $(PWD)/node_modules/react-native/react.gradle.orig: $(PWD)/patch/react.gradle.patch
 	@echo "patching file $(patsubst %.orig, %, $@)"
diff --git a/js/packages/berty-app/android/app/build.gradle b/js/packages/berty-app/android/app/build.gradle
index 1a8f41055f..62c67e1407 100644
--- a/js/packages/berty-app/android/app/build.gradle
+++ b/js/packages/berty-app/android/app/build.gradle
@@ -168,6 +168,11 @@ android {
                 storePassword BERTY_RELEASE_STORE_PASSWORD
                 keyAlias BERTY_RELEASE_KEY_ALIAS
                 keyPassword BERTY_RELEASE_KEY_PASSWORD
+            } else {
+                storeFile file('debug.keystore')
+                storePassword 'android'
+                keyAlias 'androiddebugkey'
+                keyPassword 'android'
             }
         }
     }
diff --git a/js/packages/storybook-mobile/Makefile b/js/packages/storybook-mobile/Makefile
index ec42fae340..7765e688b0 100644
--- a/js/packages/storybook-mobile/Makefile
+++ b/js/packages/storybook-mobile/Makefile
@@ -39,8 +39,13 @@ run.storybook.android: deps.storybook.mobile $(PWD)/android/app/debug.keystore
 $(PWD)/android/app/debug.keystore: $(HOME)/.android/debug.keystore
 	cp $< $@
 
+# https://coderwall.com/p/r09hoq/android-generate-release-debug-keystores
 $(HOME)/.android/debug.keystore:
-	keytool -list -alias androiddebugkey -keystore ~/.android/debug.keystore -storepass android -keypass android
+	keytool -genkey -v -keystore $@ -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000
+	# The JKS keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format
+	keytool -importkeystore -srckeystore $@ -srcstorepass android -destkeystore $@ -deststoretype pkcs12
+	# Check keystore
+	keytool -list -v -alias androiddebugkey -storepass android -keystore $@
 
 .PHONY: run.storybook.mobile
 run.storybook.mobile: run.storybook.ios run.storybook.android