diff --git a/.github/workflows/pack_early.yaml b/.github/workflows/pack_early.yaml
index 1cdd758..7c7efa2 100644
--- a/.github/workflows/pack_early.yaml
+++ b/.github/workflows/pack_early.yaml
@@ -1,10 +1,36 @@
 name: Pack_beta
 
 on:
-  pull_request:
-    branches: [main]
+  push:
+    branches: [monorepo]
 
 jobs:
+  package_application:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout Repo
+          uses: actions/checkout@v4
+          with:
+            lfs: true
+        - name: set up JDK 11
+          uses: actions/setup-java@v4
+          with:
+            java-version: '17'
+            distribution: 'zulu'
+            cache: gradle
+      
+        - name: Grant execute permission for gradlew
+          run: chmod +x gradlew
+        - name: Build with Gradle
+          run: ./gradlew assembleDebug
+        - name: Upload Artifact
+          uses: actions/upload-artifact@v4
+          with:
+            name: simtak
+            path: app/build/outputs/apk/debug/app-debug.apk
+            if-no-files-found: error
+            retention-days: 1
+
   build_extension:
     strategy:
       matrix:
@@ -37,10 +63,10 @@ jobs:
           name: ${{ matrix.os_target.target }}
           path: target/${{ matrix.os_target.target }}/release/${{ matrix.os_target.artifact }}
           if-no-files-found: error
-          retention-days: 7
+          retention-days: 1
 
   package:
-    needs: build_extension
+    needs: [build_extension, package_application]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
@@ -52,7 +78,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: x86_64-pc-windows-msvc
-      - run: ls
       - run: mv ./armatak.dll ./armatak_x64.dll
       - name: Download Windows x86 Artifact
         uses: actions/download-artifact@v4
@@ -63,6 +88,11 @@ jobs:
         with:
           name: x86_64-unknown-linux-gnu
       - run: mv ./libarmatak.so ./armatak.so
+      - name: Download Android Application Installer
+        uses: actions/download-artifact@v4
+        with:
+          name: simtak
+      - run: mv ./app-debug.apk ./simtak.apk
       - name: Setup HEMTT
         uses: arma-actions/hemtt@v1
       - name: Build
diff --git a/.github/workflows/pack_monorepo.yaml b/.github/workflows/pack_monorepo.yaml
deleted file mode 100644
index 38956ca..0000000
--- a/.github/workflows/pack_monorepo.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-name: Pack_beta
-
-on:
-  push:
-    branches: [monorepo]
-
-jobs:
-  package_application:
-      runs-on: ubuntu-latest
-      steps:
-        - name: Checkout Repo
-          uses: actions/checkout@v4
-          with:
-            lfs: true
-        - name: set up JDK 11
-          uses: actions/setup-java@v4
-          with:
-            java-version: '17'
-            distribution: 'zulu'
-            cache: gradle
-      
-        - name: Grant execute permission for gradlew
-          run: chmod +x gradlew
-        - name: Build with Gradle
-          run: ./gradlew assembleDebug
-        - name: Upload Artifact
-          uses: actions/upload-artifact@v4
-          with:
-            name: simtak
-            path: app/build/outputs/apk/debug/app-debug.apk
-            if-no-files-found: error
-            retention-days: 1
-
-  build_extension:
-    strategy:
-      matrix:
-        os_target:
-          - { os: "windows-latest", target: "i686-pc-windows-msvc", artifact: "armatak.dll", name: "armatak.dll" }
-          - { os: "windows-latest", target: "x86_64-pc-windows-msvc", artifact: "armatak.dll", name: "armatak_x64.dll" }
-          - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", artifact: "libarmatak.so", name: "armatak.so" }
-    runs-on: ${{ matrix.os_target.os }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          lfs: true
-      - name: Install Rust Toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          target: ${{ matrix.os_target.target }}
-          toolchain: stable
-          default: true
-      - name: Install Dependencies (Linux only)
-        if: matrix.os_target.os == 'ubuntu-latest'
-        run: sudo apt-get update && sudo apt-get install -y build-essential
-      - name: Cargo Build
-        run: cargo build --release --target ${{ matrix.os_target.target }}
-      - name: check stuff
-        run: ls target/release
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os_target.target }}
-          path: target/${{ matrix.os_target.target }}/release/${{ matrix.os_target.artifact }}
-          if-no-files-found: error
-          retention-days: 1
-
-  package:
-    needs: [build_extension, package_application]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          lfs: true
-      - run: mkdir -p ./target/release
-      - name: Download Windows x64 Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: x86_64-pc-windows-msvc
-      - run: ls
-      - run: mv ./armatak.dll ./armatak_x64.dll
-      - name: Download Windows x86 Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: i686-pc-windows-msvc
-      - name: Download Linux x64 Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: x86_64-unknown-linux-gnu
-      - run: mv ./libarmatak.so ./armatak.so
-      - name: Download Android Application Installer
-        uses: actions/download-artifact@v4
-        with:
-          name: simtak
-      - run: mv ./app-debug.apk ./simtak.apk
-      - name: Setup HEMTT
-        uses: arma-actions/hemtt@v1
-      - name: Build
-        run: hemtt release
-      - name: Upload Final Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: armatak.zip
-          path: 'releases/armatak-latest.zip'
\ No newline at end of file
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 6de3c22..a57b56e 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -5,6 +5,32 @@ on:
     branches: [ main ]
 
 jobs:
+  package_application:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: gradle
+    
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew assembleDebug
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: simtak
+          path: app/build/outputs/apk/debug/app-debug.apk
+          if-no-files-found: error
+          retention-days: 1
+
   build_extension:
     strategy:
       matrix:
@@ -37,10 +63,10 @@ jobs:
           name: ${{ matrix.os_target.target }}
           path: target/${{ matrix.os_target.target }}/release/${{ matrix.os_target.artifact }}
           if-no-files-found: error
-          retention-days: 7
+          retention-days: 1
 
   package:
-    needs: build_extension
+    needs: [build_extension, package_application]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
@@ -52,7 +78,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: x86_64-pc-windows-msvc
-      - run: ls
       - run: mv ./armatak.dll ./armatak_x64.dll
       - name: Download Windows x86 Artifact
         uses: actions/download-artifact@v4
@@ -63,6 +88,11 @@ jobs:
         with:
           name: x86_64-unknown-linux-gnu
       - run: mv ./libarmatak.so ./armatak.so
+      - name: Download Android Application Installer
+        uses: actions/download-artifact@v4
+        with:
+          name: simtak
+      - run: mv ./app-debug.apk ./simtak.apk
       - name: Setup HEMTT
         uses: arma-actions/hemtt@v1
       - name: Build
@@ -71,10 +101,10 @@ jobs:
         run: unzip releases/armatak-latest.zip -d releases
       - uses: arma-actions/workshop-upload@v1
         with:
-            appId: '107410'
-            itemId: ${{ secrets.STEAM_WORKSHOP_ITEM_ID }}
-            contentPath: releases/@armatak
-            changelog: 'Update'
+          appId: '107410'
+          itemId: ${{ secrets.STEAM_WORKSHOP_ITEM_ID }}
+          contentPath: releases/@armatak
+          changelog: 'Update'
         env:
-            STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
-            STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
\ No newline at end of file
+          STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+          STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
\ No newline at end of file