diff --git a/.github/build.yml b/.github/build.yml
deleted file mode 100644
index 71cbe6b6..00000000
--- a/.github/build.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  check_wrapper:
-    name: Validate Gradle Wrapper
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repo
-        uses: actions/checkout@v2
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-  build:
-    name: Build FatJar
-    needs: check_wrapper
-    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.5.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Checkout master branch
-        uses: actions/checkout@v2
-        with:
-          ref: master
-          path: master
-          fetch-depth: 0
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      - name: Copy CI gradle.properties
-        run: |
-          cd master
-          mkdir -p ~/.gradle
-          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Download and process android.jar
-        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-        run: |
-          cd master
-          ./scripts/getAndroid.sh
-
-      - name: Build Jar and launch4j
-        uses: eskatos/gradle-command-action@v1
-        with:
-          build-root-directory: master
-          wrapper-directory: master
-          arguments: :server:windowsPackage --stacktrace
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
-
-      - name: Create repo artifacts
-        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-        run: |
-          cd master
-          ./.github/scripts/create-repo.sh
-
-
-
-      - name: Create Release
-          if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-          id: create_release
-          uses: actions/create-release@v1
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          with:
-            tag_name: ${{ github.ref }}
-            release_name: Release ${{ github.ref }}
-            body: |
-                    Release body
-            draft: true
-            prerelease: false
-
-      - name: Upload Release
-        uses: AButler/upload-release-assets@v2.0
-        if: "startsWith(github.event.head_commit.message, '[RELEASE CI]')"
-        with:
-          files: 'master/repo/*'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-#          release-tag: 'v.0.2.0'
-
-#      - name: Checkout repo branch
-#        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-#        uses: actions/checkout@v2
-#        with:
-#          ref: repo
-#          path: repo
-
-
-#      - name: Deploy repo
-#        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-#        run: |
-#          cd repo
-#          ../master/.github/scripts/commit-repo.sh
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..a388d0a2
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,64 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  check_wrapper:
+    name: Validate Gradle Wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+  build:
+    name: Build FatJar
+    needs: check_wrapper
+    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.5.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout master branch
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          path: master
+          fetch-depth: 0
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Copy CI gradle.properties
+        run: |
+          cd master
+          mkdir -p ~/.gradle
+          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Download android.jar
+        run: |
+          cd master
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+
+      - name: Build Jar and launch4j
+        uses: eskatos/gradle-command-action@v1
+        with:
+          build-root-directory: master
+          wrapper-directory: master
+          arguments: :server:windowsPackage --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 62daf939..9a5e3ce0 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -46,11 +46,11 @@ jobs:
           mkdir -p ~/.gradle
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Download and process android.jar
-        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
+      - name: Download android.jar
         run: |
           cd master
-          ./scripts/getAndroid.sh
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+
 
       - name: Build Jar and launch4j
         uses: eskatos/gradle-command-action@v1
@@ -62,13 +62,12 @@ jobs:
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
+
       - name: Create repo artifacts
-        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
         run: |
           cd master
           ./.github/scripts/create-repo.sh
 
-
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -98,17 +97,3 @@ jobs:
           files: 'master/repo/*'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           release-tag: ${{ steps.get-ref.outputs.tag }}
-
-#      - name: Checkout repo branch
-#        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-#        uses: actions/checkout@v2
-#        with:
-#          ref: repo
-#          path: repo
-
-
-#      - name: Deploy repo
-#        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
-#        run: |
-#          cd repo
-#          ../master/.github/scripts/commit-repo.sh