diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bdce85a..9bd98c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,23 +22,27 @@ jobs:
       - name: Get Git commit info
         id: info
         run: |
-              echo "COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an')" >> $GITHUB_ENV
-              echo "COMMIT_MESSAGE=$(git log -1 --pretty=format:'%s')" >> $GITHUB_ENV
-              echo "COMMIT_HASH=$(git log -1 --pretty=format:'%h')" >> $GITHUB_ENV
+          echo "COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an')" >> $GITHUB_ENV
+          echo "COMMIT_MESSAGE=$(git log -1 --pretty=format:'%s')" >> $GITHUB_ENV
+          echo "COMMIT_HASH=$(git log -1 --pretty=format:'%h')" >> $GITHUB_ENV
 
       - name: Publish
         uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
           embed-title: "New build triggered"
-          embed-description: "*Commit message:* ${{ env.COMMIT_MESSAGE }}\n*Commit hash:* ${{ env.COMMIT_HASH }}\nIf the build succeeds, ill send the APK here."
+          embed-description: |
+            *Commit message:* ${{ env.COMMIT_MESSAGE }}
+            *Commit hash:* ${{ env.COMMIT_HASH }}
+            *Branch:* ${{ github.ref_name }}
+            Triggered by **${{ github.actor }}**
           embed-footer-text: "Triggered by ${{ env.COMMIT_AUTHOR }}"
 
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checking out branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Init submodules
         uses: snickerbockers/submodules-init@v4
@@ -54,18 +58,26 @@ jobs:
           distribution: 'temurin'
           java-version: 21
 
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
       - name: Build library
-        run: gradle library:assemble --stacktrace
+        run: ./gradlew library:assemble --stacktrace
 
       - name: Build developer APK
         run: |
-          gradle assembleRelease --stacktrace
+          ./gradlew assembleRelease --stacktrace
           mkdir out
           cp app/build/outputs/apk/release/app-release-unsigned.apk out/app-dev-unsigned.apk
 
-      - name: ZipAlign & Sign Android release
-        uses: kevin-david/zipalign-sign-android-release@v2.0.1
+      - name: Gen MD5sum
+        run: |
+          md5sum app/build/outputs/apk/release/app-release-unsigned.apk > out/app-dev-unsigned.md5
+
+      # You only get a signed APK for the main repo
+      - name: Sign APK
         if: github.repository_owner == 'BeboKhouja'
+        uses: r0adkll/sign-android-release@v1
         id: sign
         with:
           releaseDirectory: app/build/outputs/apk/release
@@ -73,13 +85,6 @@ jobs:
           alias: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
           keyStorePassword: ${{ secrets.RELEASE_KEY_PASSWORD }}
           keyPassword: ${{ secrets.RELEASE_KEY_PASSWORD }}
-          zipAlign: true
-
-      - name: Gen MD5sum
-        run: |
-          md5sum app/build/outputs/apk/release/app-release-unsigned.apk > out/app-dev-unsigned.md5
-
-      # You only get an unsigned APK for forks
 
       - name: Copy Signed APK
         if: github.repository_owner == 'BeboKhouja'
@@ -109,6 +114,6 @@ jobs:
       - name: Send APK to builds channel
         uses: sinshutu/upload-to-discord@master
         env:
-            DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         with:
-            args: ./out/apk/app-dev.apk ./out/apk/app-dev.md5
+          args: ./out/apk/app-dev.apk ./out/apk/app-dev.md5