diff --git a/.github/workflows/android-release-artifacts.yml b/.github/workflows/android-release-artifacts.yml
index 28ba815056..3983885848 100644
--- a/.github/workflows/android-release-artifacts.yml
+++ b/.github/workflows/android-release-artifacts.yml
@@ -2,6 +2,11 @@ name: Android Release Artifacts
 
 on:
   workflow_dispatch:
+    inputs:
+      version:
+        description: Version name to be uploaded for AAR release
+        required: false
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -29,10 +34,7 @@ jobs:
         export ARTIFACTS_DIR_NAME=artifacts-to-be-uploaded
 
         # Build LLM Demo for Android
-        # bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME}
-        mkdir -p "${ARTIFACTS_DIR_NAME}/llm_demo"
-        touch "${ARTIFACTS_DIR_NAME}/llm_demo/executorch.aar"
-
+        bash build/build_android_llm_demo.sh ${ARTIFACTS_DIR_NAME}
 
         shasum -a 256 "${ARTIFACTS_DIR_NAME}/llm_demo/executorch.aar"
 
@@ -50,7 +52,7 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::308535385114:role/gha_executorch_upload-frameworks-android
           aws-region: us-east-1
-      - name: Upload AAR to RC
+      - name: Upload AAR RC to AWS S3
         shell: bash
         run: |
           wget https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/executorch.aar
@@ -58,6 +60,7 @@ jobs:
 
           pip install awscli==1.32.18
           AWS_CMD="aws s3 cp"
-          VERSION_NAME="$(date +'%Y%m%d')"
+          VERSION="${{ inputs.version }}"
+          VERSION_NAME="${VERSION:-temp_snapshot}"
           ${AWS_CMD} executorch.aar s3://ossci-android/executorch/release/${VERSION_NAME}/executorch.aar --acl public-read
           ${AWS_CMD} executorch.aar.sha256sums s3://ossci-android/executorch/release/${VERSION_NAME}/executorch.aar.sha256sums --acl public-read
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c34beb1fba..86077a18b2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -53,34 +53,6 @@ jobs:
 
         shasum -a 256 "${ARTIFACTS_DIR_NAME}/llm_demo/executorch.aar"
 
-  upload-release-aar:
-    name: upload-release-aar
-    needs: build-aar
-    if: ${{ startsWith(github.ref, 'refs/tags/android/release') }}
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - name: configure aws credentials
-        uses: aws-actions/configure-aws-credentials@v1.7.0
-        with:
-          role-to-assume: arn:aws:iam::308535385114:role/gha_executorch_upload-frameworks-android
-          aws-region: us-east-1
-      - name: Upload AAR to RC if ciflow/android/release tag is present
-        shell: bash
-        run: |
-          wget https://gha-artifacts.s3.amazonaws.com/${{ github.repository }}/${{ github.run_id }}/artifacts/llm_demo/executorch.aar
-          shasum -a 256 executorch.aar > executorch.aar.sha256sums
-
-          pip install awscli==1.32.18
-          AWS_CMD="aws s3 cp"
-          VERSION="${{ inputs.version }}"
-          VERSION_NAME="${VERSION:-temp_snapshot}"
-          ${AWS_CMD} executorch.aar s3://ossci-android/executorch/release/${VERSION_NAME}/executorch.aar --acl public-read
-          ${AWS_CMD} executorch.aar.sha256sums s3://ossci-android/executorch/release/${VERSION_NAME}/executorch.aar.sha256sums --acl public-read
-
   # Running Android emulator directly on the runner and not using Docker
   run-emulator:
     needs: build-aar