diff --git a/.github/workflows/apk-release.yml b/.github/workflows/apk-release.yml
index 5171005..8bea6b7 100644
--- a/.github/workflows/apk-release.yml
+++ b/.github/workflows/apk-release.yml
@@ -20,21 +20,15 @@ jobs:
           distribution: 'adopt'
           cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Generate Debug APK
-        run: ./gradlew clean assembleDebug
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Download Snapchat APK
         run: wget -q -O snapchat.apk "$APK_URL"
         env:
           APK_URL: ${{ secrets.APK_URL }}
 
-      - name: Download dexsearch
-        run: wget -q -O dexsearch.jar "https://github.com/rodit/dexsearch/releases/download/$DEXSEARCH_VERSION/dexsearch-latest.jar"
+      - name: Download dexsearch and clientlib
+        run: |
+          wget -q -O dexsearch.jar "https://github.com/rodit/dexsearch/releases/download/$DEXSEARCH_VERSION/dexsearch-latest.jar"
+          wget -q -O app/libs/clientlib.jar "https://github.com/rodit/dexsearch/releases/download/$DEXSEARCH_VERSION/clientlib-latest.jar"
         env:
           DEXSEARCH_VERSION: ${{ secrets.DEXSEARCH_VERSION }}
 
@@ -43,8 +37,16 @@ jobs:
           wget -q -O android.zip "https://dl.google.com/android/repository/platform-32_r01.zip"
           unzip -qq android.zip
 
-      - name: Generate Bindings
-        run: java -jar dexsearch.jar -i snapchat.apk -s snap.ds -o bindings.json -a "android-12/android.jar"
+      - name: Generate Bindings and snapmod jar
+        run: java -jar dexsearch.jar -i snapchat.apk -s snap.ds -o bindings.json -j app/libs/snapmod.jar -a "android-12/android.jar" -p xyz.rodit.snapmod.mappings
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Generate Debug APK
+        run: ./gradlew clean assembleDebug
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish Release APK and Bindings
         uses: marvinpinto/action-automatic-releases@latest