diff --git a/.github/workflows/cache_dependencies.yml b/.github/workflows/cache_dependencies.yml
index 6ec5b54..2cb3bfa 100644
--- a/.github/workflows/cache_dependencies.yml
+++ b/.github/workflows/cache_dependencies.yml
@@ -12,18 +12,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '11.x'
-
-      - name: Flutter action
-        uses: subosito/flutter-action@v1
-        with:
-          flutter-version: '3.10.x'
-          channel: stable
-
-      - name: Install package dependencies
-        run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
 
       - name: Execute Build and Setup Commands
         run: |
@@ -31,10 +19,8 @@ jobs:
           sudo chown $USER /opt/android
           cd /opt/android
           git clone https://github.com/Elite-Labs/EliteWallet --branch main
-          cd EliteWallet/scripts/android/
-          ./install_ndk.sh
-          source ./app_env.sh elitewallet
-          ./app_config.sh
+          cd EliteWallet/
+          ./scripts/build_deps.sh --skip_main_deps android
 
       - name: Cache Externals
         id: cache-externals
@@ -53,7 +39,5 @@ jobs:
       - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
         name: Generate Externals
         run: |
-          cd /opt/android/EliteWallet/scripts/android/
-          source ./app_env.sh elitewallet
-          ./build_all.sh
-          ./copy_monero_deps.sh
+          cd /opt/android/EliteWallet/
+          ./scripts/build_deps.sh android
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 31cfa6d..74bd766 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -23,7 +23,7 @@ fi
 
 if [[ ! " $@ " =~ " --skip_other_deps " ]]; then
   if [[ "$BUILD_PLATFORM" == "android" ]]; then
-    sudo apt-get install -y curl unzip automake build-essential file pkg-config git python2 libtool libtinfo5 cmake openjdk-8-jre-headless clang bison byacc gperf groff
+    sudo apt-get install -y curl unzip automake build-essential file pkg-config git python2 libtool libtinfo5 cmake openjdk-11-jre-headless clang bison byacc gperf groff
   else
     brew install autoconf cmake pkg-config cocoapods
   fi
@@ -33,6 +33,10 @@ git config --global protocol.file.allow always
 
 git submodule update --init --force
 
+if [[ ! " $@ " =~ " --skip_main_deps " ]]; then
+    exit 0
+fi
+
 cd scripts/android
 
 configure_and_build_deps () {