diff --git a/.travis.yml b/.travis.yml
index f1fe58c7c..18389156d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,33 +2,32 @@ language: android
 dist: trusty
 sudo: false
 jdk:
-  - oraclejdk8
+- oraclejdk8
 android:
   components:
-    - tools
-    # - android-26
-    # - android-28
-    - build-tools-26.0.1
-    # - build-tools-28.0.3
-    # - build-tools-29.0.2
-    - platform-tools
+  - tools
+  - android-26
+  - build-tools-26.0.1
+  - build-tools-29.0.2
+  - platform-tools
 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
   directories:
-    - "${TRAVIS_BUILD_DIR}/gradle/caches/"
-    - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
-    - "$HOME/.gradle/caches/"
-    - "$HOME/.gradle/wrapper/"
+  - "${TRAVIS_BUILD_DIR}/gradle/caches/"
+  - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
 script:
-  # - ./gradlew spotlessCheck
-  - cp -v app/src/sample_config_files/sample_keystore.properties keystore.properties
-  - keytool -genkeypair -dname "cn=TravisCI, ou=TravisCI, o=Sun, c=US" -alias business -keypass kpi135 -keystore android.keystore -storepass ab987c -validity 20000
-  # - ./gradlew build
+- cp -v app/src/sample_config_files/sample_keystore.properties keystore.properties
+- keytool -genkeypair -dname "cn=TravisCI, ou=TravisCI, o=Sun, c=US" -alias business
+  -keypass kpi135 -keystore android.keystore -storepass ab987c -validity 20000
 after_success:
-  - bash scripts/update-apk.sh
-
+- bash scripts/update_apk.sh
 branches:
   only:
-    - master
-    - development
+  - master
+  - development
+env:
+  global:
+    secure: IIQRAmd5kAgnIdaWYtN2f8eyTgLNdyfUQKz0cwQMY+glfWHDqV3zPvCBNqoVNHoTSpfIBWDYY9y4mCDDZPMZntXS3yBfD5zk79Y3ReI2ZgGCs40wSQQQL3Hlw3WT9i/JO1f0boEyDYpN7BdomWGsAE7JJW+Eue7Z+j+2z/ltc7IiLUSCcgZO0IObEFKQEdZekmXNA8kopR2SI3pTED//JB49r3BT7foNPv0dnIOb+7WoeKBlesFOidxcSmtx5ccn21/CWlYP1gFOFFt/z5w+zBzDxVtGLGOqu7mwb4D3CkXoVKpVvcGbtl2y8b/9whs2eYlpAysvz7ULtPr8Em4GHNj+YAHxQMK9YSIK3SWZ9kPDxK9vVmzHYkAGTeysEiXLiHeqTFWFPZ8ndJGnaJIe07PDYLypcEckOjltiY/Hl5aOYIPmoajFeI3cfbTcNTS5XXKbAmgbgl9ln5bgviOvLZ28Jxlg4oAHchA4ILSgKDk292mqCBCHYPpPTSI/83rxpx94/T0wJiF62JO1GxGHgLCxv5Vu3SRL6xq3vHbrFSa2Pw2joBxMcRKJD83sCMzZY2jPA992JcHIDaRfeqdXedcDWYNHUoTHVkh9mRixcXjH1Yh0GiDBwoB/uk8EAeDCKoU204VpIwh0bYNdQ2jI2hbvfLanAYjPJpJ88xhewA8=
diff --git a/scripts/update_apk.sh b/scripts/update_apk.sh
index e1aff584c..f2f638156 100755
--- a/scripts/update_apk.sh
+++ b/scripts/update_apk.sh
@@ -2,52 +2,63 @@
 
 set -e
 
+if [ "${TRAVIS_PULL_REQUEST_BRANCH}" == "false" ]; then
+    echo "We only work with pull request";
+    exit 0;
+fi
+
 git config --global user.name "Travis CI"
 git config --global user.email "noreply+travis@robotutor.org"
 
 export DEPLOY_BRANCH=${DEPLOY_BRANCH:-development}
 export PUBLISH_BRANCH=${PUBLISH_BRANCH:-master}
-DATE_TODAY=$(date + '%m/%d/%y')
+DATE_TODAY=$(date +%Y-%m-%d)
 
-if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "roboTutorLLC/RoboTutor_2020" ] ; then
-    echo "We upload apk only for changes in development or master, and not PRs. So, let's skip this shall we ? :)"
-    exit 0
-fi
+echo $TRAVIS_REPO_SLUG, $TRAVIS_PULL_REQUEST;
+# if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "RoboTutorLLC/RoboTutor_2020" ] ; then
+#     echo "We upload apk only for changes in development or master, and not PRs. So, let's skip this shall we ? :)"
+#     exit 0
+# fi
 
 
 release_apk_build () {
+    echo "Building release apk";
     ./gradlew bundlePlayStoreRelease;
 }
 
 debug_apk_build () {
-    ./gradlew assembleDebug
+    echo "Building debug apk";
+    ./gradlew assembleDebug;
 }
 
-if [ "${TRAVIS_BRANCH}" == "${PUBLISH_BRANCH}"]; then
-    release_apk_build()
+# yes | sdkmanager --licenses
+if [ "${TRAVIS_BRANCH}" == "${PUBLISH_BRANCH}" ]; then
+    release_apk_build
 else
-    debug_apk_build()
+    debug_apk_build
 fi
 
 
 
-git clone --quiet --branch=apk https://robotutor:$GITHUB_API_KEY@github.com/RoboTutorLLC/RoboTutor_2020 apk > /dev/null
+git clone --quiet --branch=apk https://robotutor:$GH_TOKEN@github.com/RoboTutorLLC/RoboTutor_2020 apk > /dev/null
 cd apk
 
-
+echo `ls`
 find ../app/build/outputs/apk/debug -type f -name '*.apk' -exec mv -v {} temp.apk \;
-find ../app/build/outputs -type f -name '*.aab' -exec cp -v {} temp.aab \;
 
 
-mv temp.apk RoboTutor-${TRAVIS_BRANCH}-${DATE_TODAY}.apk
-mv temp.aab RoboTutor-${TRAVIS_BRANCH}-${DATE_TODAY}.aab
-
+mv temp.apk RoboTutor-${TRAVIS_PULL_REQUEST_BRANCH}-${DATE_TODAY}.apk
 
+ls
+echo `ls -al`
+git status
+echo $(git status)
 # Create a new branch that will contains only latest apk
 # git checkout --orphan temporary
 
+
 # Add generated APK
-git add --all .
+git add .
 git commit -am "[Auto] Update Test Apk ($(date +%Y-%m-%d.%H:%M:%S))"
 
 # Delete current apk branch