diff --git a/MasterPassword/Java/masterpassword-android/build.gradle b/MasterPassword/Java/masterpassword-android/build.gradle
index 3ec801ca..a42d6208 100644
--- a/MasterPassword/Java/masterpassword-android/build.gradle
+++ b/MasterPassword/Java/masterpassword-android/build.gradle
@@ -16,9 +16,17 @@ android {
         versionName "2.4.1"
     }
     signingConfigs {
-        lyndir {
-            keyAlias 'lyndir'
-            storeFile file('/Users/lhunath/annex/secret/masterpassword.keystore')
+        release {
+            storeFile file('masterpassword.keystore')
+            storePassword System.getenv('STORE_PW')
+
+            keyAlias 'masterpassword-android'
+            keyPassword System.getenv('KEY_PW')
+        }
+    }
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
         }
     }
 }
diff --git a/MasterPassword/Java/masterpassword-android/masterpassword.jks b/MasterPassword/Java/masterpassword-android/masterpassword.jks
new file mode 120000
index 00000000..d426a1f4
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/masterpassword.jks
@@ -0,0 +1 @@
+/Users/lhunath/annex/secret/release-com.lyndir.masterpassword.jks
\ No newline at end of file
diff --git a/MasterPassword/Java/masterpassword-android/masterpassword.keystore b/MasterPassword/Java/masterpassword-android/masterpassword.keystore
new file mode 120000
index 00000000..8e3ba215
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/masterpassword.keystore
@@ -0,0 +1 @@
+/Users/lhunath/annex/secret/masterpassword.keystore
\ No newline at end of file
diff --git a/MasterPassword/Java/masterpassword-android/release.jks b/MasterPassword/Java/masterpassword-android/release.jks
deleted file mode 120000
index 35870df1..00000000
--- a/MasterPassword/Java/masterpassword-android/release.jks
+++ /dev/null
@@ -1 +0,0 @@
-/Users/lhunath/SpiderOak Hive/secret/release-com.lyndir.masterpassword.jks
\ No newline at end of file