diff --git a/scripts/build-olympus.bash b/scripts/build-olympus.bash
index f9cabf06..03efd57f 100755
--- a/scripts/build-olympus.bash
+++ b/scripts/build-olympus.bash
@@ -11,12 +11,22 @@
 # For starters lets only create keychains in travis, since locally everything is setup already. But ultimately, we should create a separate new keychain locally to so that we can test that better
 echo "-- TRAVIS: $TRAVIS"
 
-# Decrypting certs and profiles (not sure if profiles actually need to be encrypted, but this is how others did it so I'm following the same route just to be on the safe side)
-echo "-- Setting up signing"
-echo "-- Decrypting keys, etc"
-echo "-- Setting up keychain"
 
-echo "-- Installing provisioning profiles, so that XCode can find them"
+if [ ! -z "$TRAVIS" ]
+then
+	# Decrypting certs and profiles (not sure if profiles actually need to be encrypted, but this is how others did it so I'm following the same route just to be on the safe side)
+	echo "-- Setting up signing"
+	echo "-- Decrypting keystore"
+	openssl aes-256-cbc -k "$FILE_ENCRYPTION_PASSWORD" -in scripts/keystore/${DEVELOPMENT_KEYSTORE}.enc -d -a -out scripts/certs/${DEVELOPMENT_KEYSTORE}
+
+	echo "-- Installing keystore"
+	ll ~/.android/
+
+	# Overwrite default keystore file only in travis, let's keep local builds separate for now
+	cp scripts/certs/${DEVELOPMENT_KEYSTORE} ~/.android/debug.keystore
+fi
+
+#echo "-- Installing provisioning profiles, so that XCode can find them"
 
 
 if [ ! -z "$TRAVIS" ]
diff --git a/scripts/keystore/debug.keystore.enc b/scripts/keystore/debug.keystore.enc
new file mode 100644
index 00000000..c99f9e69
--- /dev/null
+++ b/scripts/keystore/debug.keystore.enc
@@ -0,0 +1,27 @@
+U2FsdGVkX1/EAExn5PtaD0H1rmC40xnids0x7ynVbQPf4YoWA/ks6srGNLq1jWvD
+5y+ZRD7NaKgtcttt2XhwY8rGHGqWJDxI1Syk8Xrt2RMBsjl2fwk1jv5DUw5hDsqX
+nh7khrv8ZtxgcWMFg0YL3Osmic1lsy6x3jgjRt0WAnUARNLoH3Vx8ijNc+ZJwikI
+6eB7m3SjZskBbkKv9N/b8EX+6w/6/zrKmdxntXcfwRq4JhgzUhd4ino/fa+YkIvJ
+O0Tizw+Xc5aKY3/vlAYuOxEMPetSlNvpf4KrnZjqfvLtATP+ZO2jjzX9lxncu7kp
+ttE/o4K7oekVwnu29cQE6DLwnm2TaGmsfdpIgwWgx5FUR6EQOsG7SD1q43anjliP
+G3OPMtomVDlaBcMdZXyasJYpaUwUqb0EUHko5dIHQI7Cz1Pd1ZjB0h/7hiKGgwO7
+7xPakcEyzyrMbfc/3NMyd4lM2+6qQmbzbYDHjp7S210eJ3+O6V9dgr5XU+MwRd2r
+WTh/RNF6j9t+kj51cyS7mdu3ulk5UB7Jw9e1cWDIs6Ceb9rpBFA2P/nudtzwrn82
+Tjjw7EwBOrOi8UQUVDZlemXn8gGctrTCziDOTOjXR+tjzrv05RvWhWwexmZ0AIJ7
+yQgWiLnP/MlH68JArNRnAPQrTGevU1FH+v5IrOwBcw1josa7TVsc9a5QbWuoQZBY
+iuAef8Mx0j8Q+YBccOoDx/46t71L0mzrb1et5rTYak/w/6mhid0LJHTWU0NiPu9r
+HL4L2C1AQW2Sq5IGkXULCkbyRAhZC7z/B1vvFsFXfiEv+6Ma2wFAcjB3otqZ6Xvo
+YIYSbccH9XbEizlGcQeegd1kR7S6Q67VjAFKlzq+hknGAui21/2x79aE3JJ6icTH
+VgzTDZ+zg0nJ5cCFbVKm5u8IVV4dU7kOX7mCM0QMNTehlK5Dk5KmAs4Ru8mvjaJ7
+Z+3hVaBe5K0wZI3eR2EVIhr+tkpWhkgBDyfcI0KpJkJ3SsGTQ+cVuRrtJ+7K/ypc
+vGRPBphtRav0IzXyfe0FeHCSbzUJgo0EKgh9zi1RciV1zbU3sOkgLxB0I/PvKmq/
+rwT8OewzQ38aqU3TLA8n3t7hriHnoGzD7Pjw+CYMn+TKhF3omhwz7u5dWVpwKq2s
+cptu713uP3BHD16YGq65RssqsXrW4OlKdRIMWlkP+obdhtR7Q4NAKPLr7+SO569g
+MBzQ7eV00T8C7IkCzwAh00AeHzilm+fCwuePfczpcS9X9nQVldQ5B52Ym7UuSRyJ
+Yx52b3bTCQNm6+fQXjZaaWT5BSXxaOZcCnSnyLwmHKSB7kl+QZIL0YUmjYJFxpj8
+xUB7KCCoN9/eVMjo1+g0DckDGRbOtnuz2GgMR/w4CTV9Fpv/C/eSbcr4JKJLmpC4
+JoJZaeRaTf3jBQH6gp7qGk6DZrN/ebW+W6pi7vvqfhs4JrJnFVtvqKy65UE4KM0B
+wISy6QW9YEjSTjA1NcoL874cnnVE0tkvf2/pEtwxnY110O4V2aag4ZbrO3FiuHs7
+k8IsSJxcg0Nm6XTuMdNdht0MRDg0twxI49Mg1P5okhlwlc7BqIGck4PzOQe4mx8E
+n2bS4CmB33d94v3npBdYFjynflKX64U7kL8KmJYNFSPv6AXX/E+dfNOeeJD9eQpA
+isYjCi/uV+w7qhK0bi4e38xsT9FQQlbVprxn/mY0dr4=
diff --git a/scripts/local-wrapper.bash b/scripts/local-wrapper.bash
index d754ed40..287f3bc4 100755
--- a/scripts/local-wrapper.bash
+++ b/scripts/local-wrapper.bash
@@ -63,20 +63,20 @@ export -f is_git_repo_state_clean
 # Common to local and travis builds
 export COMMIT_AUTHOR_EMAIL="antonis.tsakiridis@telestax.com"
 export APP_NAME="restcomm-olympus"
-export DEVELOPER_NAME="iPhone Distribution: Telestax, Inc."
-export DEVELOPMENT_TEAM="H9PG74NSQT"
+#export DEVELOPER_NAME="iPhone Distribution: Telestax, Inc."
+#export DEVELOPMENT_TEAM="H9PG74NSQT"
 # Keep the first seven chars from SHA1 as typically done
 export COMMIT_SHA1=`git rev-parse HEAD | cut -c -7`
 #export DEVELOPMENT_PROVISIONING_PROFILE_NAME="development"
 
-export APPLE_CERT="AppleWWDRCA.cer"
-export DEVELOPMENT_CERT="development-cert.cer"
-export DEVELOPMENT_KEY="development-key.p12"
-export DISTRIBUTION_CERT="enterprise-distribution-cert.cer"
-export DISTRIBUTION_KEY="enterprise-distribution-key.p12"
-export DEVELOPMENT_PROVISIONING_PROFILE_OLYMPUS_NAME="profile-development-olympus"
-export DISTRIBUTION_PROVISIONING_PROFILE_OLYMPUS_NAME="profile-distribution-olympus"
-export CUSTOM_KEYCHAIN="ios-build.keychain"
+#export APPLE_CERT="AppleWWDRCA.cer"
+export DEVELOPMENT_KEYSTORE="debug.keystore"
+#export DEVELOPMENT_KEY="development-key.p12"
+#export DISTRIBUTION_CERT="enterprise-distribution-cert.cer"
+#export DISTRIBUTION_KEY="enterprise-distribution-key.p12"
+#export DEVELOPMENT_PROVISIONING_PROFILE_OLYMPUS_NAME="profile-development-olympus"
+#export DISTRIBUTION_PROVISIONING_PROFILE_OLYMPUS_NAME="profile-distribution-olympus"
+#export CUSTOM_KEYCHAIN="ios-build.keychain"
 
 if [ ! -z "$TRAVIS" ]
 then