diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0a39c9c..dc1eec4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -55,7 +55,14 @@ jobs:
       env:
         ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
-    - name: Gradle build
+    - name: Gradle build  
+      if: github.ref_name != 'main'
+      run: |
+        chmod +x gradlew
+        ./gradlew buildRelease
+
+    - name: Gradle signed build
+      if: github.ref_name == 'main'
       run: |
         echo "${{ secrets.RELEASE_KEYSTORE }}" > app/gha.keystore.asc
         gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch app/gha.keystore.asc > app/gha.jks
@@ -63,6 +70,7 @@ jobs:
         ./gradlew assembleYggdrasil
 
     - name: Upload artifact
+      if: github.ref_name == 'main'
       uses: actions/upload-artifact@v3
       with:
         name: yggdrasil-android
diff --git a/.github/workflows/nightlylink.yml b/.github/workflows/nightlylink.yml
deleted file mode 100644
index a90b517..0000000
--- a/.github/workflows/nightlylink.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: Comment
-on:
-  workflow_run:
-    workflows: ['Build']
-    types: [completed]
-jobs:
-  pr_comment:
-    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          # This snippet is public-domain, taken from
-          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
-          script: |
-            async function upsertComment(owner, repo, issue_number, purpose, body) {
-              const {data: comments} = await github.rest.issues.listComments(
-                {owner, repo, issue_number});
-
-              const marker = `<!-- bot: ${purpose} -->`;
-              body = marker + "\n" + body;
-
-              const existing = comments.filter((c) => c.body.includes(marker));
-              if (existing.length > 0) {
-                const last = existing[existing.length - 1];
-                core.info(`Updating comment ${last.id}`);
-                await github.rest.issues.updateComment({
-                  owner, repo,
-                  body,
-                  comment_id: last.id,
-                });
-              } else {
-                core.info(`Creating a comment in issue / PR #${issue_number}`);
-                await github.rest.issues.createComment({issue_number, body, owner, repo});
-              }
-            }
-
-            const {owner, repo} = context.repo;
-            const run_id = ${{github.event.workflow_run.id}};
-
-            const pull_requests = ${{ toJSON(github.event.workflow_run.pull_requests) }};
-            if (!pull_requests.length) {
-              return core.error("This workflow doesn't match any pull requests!");
-            }
-
-            const artifacts = await github.paginate(
-              github.rest.actions.listWorkflowRunArtifacts, {owner, repo, run_id});
-            if (!artifacts.length) {
-              return core.error(`No artifacts found`);
-            }
-            let body = `Download the artifacts for this pull request:\n`;
-            for (const art of artifacts) {
-              body += `\n* [${art.name}.zip](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
-            }
-
-            core.info("Review thread message body:", body);
-
-            for (const pr of pull_requests) {
-              await upsertComment(owner, repo, pr.number,
-                "nightly-link", body);
-            }
-