diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index ab3a661b..5926a502 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   prepare:
     name: Prepare job
-    runs-on: docker
+    runs-on: ubuntu-22.04
     outputs:
       individualMatrix: ${{ steps.generate-matrices.outputs.individualMatrix }}
     steps:
@@ -49,7 +49,7 @@ jobs:
   build_individual:
     name: Build individual modules
     needs: prepare
-    runs-on: docker
+    runs-on: ubuntu-22.04
     strategy:
       matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }}
     steps:
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 2c384d0d..cbd3271b 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -94,6 +94,11 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
+          
+      - name: Set up Android SDK
+        uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3
+        with:
+          packages: ""
 
       - name: Prepare signing key
         run: |
@@ -111,8 +116,8 @@ jobs:
         run: chmod +x ./gradlew && ./gradlew -p src assembleRelease
 
       - name: Upload APKs (chunk ${{ matrix.chunk }})
-        uses: https://github.com/actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
-        if: "github.repository == 'Kohi-den/extensions-source'"
+        uses: https://code.forgejo.org/forgejo/upload-artifact@16871d9e8cfcf27ff31822cac382bbb5450f1e1e # v4-patch
+        if: "github.repository == 'AlmightyHak/extensions-source'"
         with:
           name: "individual-apks-${{ matrix.chunk }}"
           path: "**/*.apk"
@@ -128,23 +133,32 @@ jobs:
     if: "github.repository == 'AlmightyHak/extensions-source'"
     runs-on: ubuntu-22.04
     steps:
+      - name: Setup rsync
+        run: |
+          sudo apt-get update && sudo apt install rsync -y
+      
       - name: Download APK artifacts
-        uses: https://github.com/actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4
+        uses: https://code.forgejo.org/forgejo/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4-patch
         with:
           path: ~/apk-artifacts
-
+          
       - name: Set up JDK
         uses: https://github.com/actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
           distribution: temurin
-
+          
+      - name: Set up Android SDK
+        uses: https://github.com/android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3
+        with:
+          packages: "build-tools;34.0.0"
+                
       - name: Checkout main branch
         uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           ref: main
           path: main
-
+          
       - name: Create repo artifacts
         run: |
           cd main
@@ -152,7 +166,7 @@ jobs:
           INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')"
           curl -L "$INSPECTOR_LINK" -o ./Inspector.jar
           java -jar ./Inspector.jar "repo/apk" "output.json" "tmp"
-          python ./.github/scripts/create-repo.py
+          python ./.github/scripts/create-repo.py    
 
       - name: Checkout repo branch
         uses: https://github.com/actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
diff --git a/local.properties b/local.properties
deleted file mode 100644
index c2f2dda1..00000000
--- a/local.properties
+++ /dev/null
@@ -1 +0,0 @@
-sdk.dir=/workspace/AlmightyHak/extensions-source/SDK
\ No newline at end of file