diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 78009984..6fbd6c5b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    name: Build and upload SideStore Nightly
+    name: Build and upload SideStore Nightly releases
     concurrency:
       group: ${{ github.ref }}
       cancel-in-progress: true
@@ -15,10 +15,14 @@ jobs:
       matrix:
         include:
           - os: 'macos-14'
-            version: '15.4'
+            version: '16.1'
 
     runs-on: ${{ matrix.os }}
     steps:
+
+      - name: Set current build as BETA
+        run: echo "IS_BETA=1" >> $GITHUB_ENV
+        
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -36,6 +40,10 @@ jobs:
           path: .nightly-build-num
           key: nightly-build-num
 
+      - name: Get version
+        id: version-marketing
+        run: echo "VERSION_IPA=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_ENV
+
       - name: Increase nightly build number and set as version
         run: bash .github/workflows/increase-nightly-build-num.sh
 
@@ -60,6 +68,70 @@ jobs:
           swiftpm-cache-restore-keys: |
             xcode-cache-sourcedata-
 
+
+      - name: Restore Pods from Cache (Exact match)
+        id: pods-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ./Podfile.lock
+            ./Pods/
+            ./AltStore.xcworkspace/
+          key: pods-cache-${{ hashFiles('Podfile') }}
+          # restore-keys: |         # commented out to strictly check cache for this particular podfile
+          #   pods-cache-
+          
+      - name: Restore Pods from Cache (Last Available)
+        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }} 
+        id: pods-restore-recent
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ./Podfile.lock
+            ./Pods/
+            ./AltStore.xcworkspace/
+          key: pods-cache-
+
+      - name: Install CocoaPods
+        # if: ${{ steps.pods-restore.outputs.cache-hit != 'true'}}
+        id: pods-install
+        run: |
+          pod install
+
+      - name: Save Pods to Cache
+        id: save-pods
+        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ./Podfile.lock
+            ./Pods/
+            ./AltStore.xcworkspace/
+          key: pods-cache-${{ hashFiles('Podfile') }}
+    
+      - name: List Files and derived data
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+          
+          echo ">>>>>>>>> Pods <<<<<<<<<<"
+          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists    
+          echo ""
+          
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
+          echo ""
+          
+          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
+          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
+          echo ""
+          
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists    
+          echo ""
+
+        
       - name: Build SideStore
         run: NSUnbufferedIO=YES make build 2>&1 | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
 
@@ -77,6 +149,9 @@ jobs:
         id: date_altstore
         run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
 
+      - name: Create dSYMs zip
+        run: zip -r -9 ./SideStore.dSYMs.zip ./SideStore.xcarchive/dSYMs/*
+      
       - name: Upload to nightly release
         uses: IsaacShelton/update-existing-release@v1.3.1
         with:
@@ -84,20 +159,20 @@ jobs:
           release: "Nightly"
           tag: "nightly"
           prerelease: true
-          files: SideStore.ipa
+          files: SideStore.ipa SideStore.dSYMs.zip
           body: |
-            This is an ⚠️ **EXPERIMENTAL** ⚠️ nightly build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
-            
-            Nightly builds are **extremely experimental builds only meant to be used by developers and alpha testers. They often contain bugs and experimental features. Use at your own risk!**
-            
-            If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases?q=beta).
-            
-            ## Build Info
-            
-            Built at (UTC): `${{ steps.date.outputs.date }}`
-            Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
-            Commit SHA: `${{ github.sha }}`
-            Version: `${{ steps.version.outputs.version }}`
+              This is an ⚠️ **EXPERIMENTAL** ⚠️ nightly build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
+              
+              Nightly builds are **extremely experimental builds only meant to be used by developers and beta testers. They often contain bugs and experimental features. Use at your own risk!**
+              
+              If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Stable](https://github.com/${{ github.repository }}/releases?q=stable).
+              
+              ## Build Info
+              
+              Built at (UTC): `${{ steps.date.outputs.date }}`
+              Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
+              Commit SHA: `${{ github.sha }}`
+              Version: `${{ steps.version.outputs.version }}`
 
       - name: Add version to IPA file name
         run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
@@ -112,4 +187,99 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
-          path: ./*.dSYM/
+          path: ./SideStore.xcarchive/dSYMs/*
+
+      # Check if PUBLISH_BETA_UPDATES secret is set to non-zero
+      - name: Check if PUBLISH_BETA_UPDATES is set
+        id: check_publish
+        run: |
+          if [[ "${{ secrets.PUBLISH_BETA_UPDATES }}" != "__YES__" ]]; then
+            echo "PUBLISH_BETA_UPDATES is not set. Skipping deployment."
+            exit 1  # Exit with 1 to indicate no deployment
+          else
+            echo "PUBLISH_BETA_UPDATES is set. Proceeding with deployment."
+            exit 0  # Exit with 0 to indicate deployment should proceed
+          fi
+        continue-on-error: true  # Continue even if exit code is 1
+
+      - name: Get short commit hash
+        if: ${{ steps.check_publish.outcome == 'success' }}
+        run: |
+          # SHORT_COMMIT="${{ github.sha }}"
+          SHORT_COMMIT=${GITHUB_SHA:0:7}
+          echo "Short commit hash: $SHORT_COMMIT"
+          echo "SHORT_COMMIT=$SHORT_COMMIT" >> $GITHUB_ENV          
+
+      - name: Get formatted date
+        if: ${{ steps.check_publish.outcome == 'success' }}
+        run: |
+          FORMATTED_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+          echo "Formatted date: $FORMATTED_DATE"
+          echo "FORMATTED_DATE=$FORMATTED_DATE" >> $GITHUB_ENV          
+      
+      - name: Get size of IPA in bytes (macOS/Linux)
+        if: ${{ steps.check_publish.outcome == 'success' }}
+        run: |
+          if [[ "$(uname)" == "Darwin" ]]; then
+            # macOS
+            IPA_SIZE=$(stat -f %z SideStore-${{ steps.version.outputs.version }}.ipa)
+          else
+            # Linux
+            IPA_SIZE=$(stat -c %s SideStore-${{ steps.version.outputs.version }}.ipa)
+          fi
+          echo "IPA size in bytes: $IPA_SIZE"
+          echo "IPA_SIZE=$IPA_SIZE" >> $GITHUB_ENV
+
+      - name: Compute SHA-256 of IPA
+        if: ${{ steps.check_publish.outcome == 'success' }}
+        run: |
+          SHA256_HASH=$(shasum -a 256 SideStore-${{ steps.version.outputs.version }}.ipa | awk '{ print $1 }')
+          echo "SHA-256 Hash: $SHA256_HASH"
+          echo "SHA256_HASH=$SHA256_HASH" >> $GITHUB_ENV
+
+      - name: Set environment variables dynamically
+        if: ${{ steps.check_publish.outcome == 'success' }}
+        run: |
+          echo "VERSION_IPA=$VERSION_IPA" >> $GITHUB_ENV
+          echo "VERSION_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
+          echo "BETA=true" >> $GITHUB_ENV
+          echo "COMMIT_ID=$SHORT_COMMIT" >> $GITHUB_ENV
+          echo "SIZE=$IPA_SIZE" >> $GITHUB_ENV
+          echo "SHA256=$SHA256_HASH" >> $GITHUB_ENV
+          echo "LOCALIZED_DESCRIPTION=This is nightly release for revision: ${{ github.sha }}" >> $GITHUB_ENV
+          echo "DOWNLOAD_URL=https://github.com/SideStore/SideStore/releases/download/nightly/SideStore.ipa" >> $GITHUB_ENV
+
+      # - name: Checkout SideStore/apps-v2.json
+      #   if: ${{ steps.check_publish.outcome == 'success' }}
+      #   uses: actions/checkout@v4
+      #   with:
+      #       # Repository name with owner. For example, actions/checkout
+      #       # Default: ${{ github.repository }}
+      #       repository: 'SideStore/apps-v2.json'
+      #       # ref: 'main' # TODO: use branches for alpha and beta tracks? so as to avoid push collision?
+      #       ref: 'nightly' # TODO: use branches for alpha and beta tracks? so as to avoid push collision?
+      #       # token: ${{ github.token }}
+      #       token: ${{ secrets.APPS_DEPLOY_KEY }}
+      #       path: 'SideStore/apps-v2.json'
+      
+      # - name: Publish to SideStore/apps-v2.json
+      #   if: ${{ steps.check_publish.outcome == 'success' }}
+      #   run: |
+      #     # Copy and execute the update script
+      #     pushd SideStore/apps-v2.json/
+  
+      #     # Configure Git user (committer details)
+      #     git config user.name "GitHub Actions"
+      #     git config user.email "github-actions@github.com"
+          
+      #     # Make the update script executable and run it
+      #     python3 ../../update_apps.py "./_includes/source.json"
+          
+      #     # Commit changes and push using SSH
+      #     git add ./_includes/source.json
+      #     git commit -m " - updated for $SHORT_COMMIT deployment" || echo "No changes to commit"
+
+      #     git status
+      #     # git push origin HEAD:main
+      #     git push origin HEAD:nightly
+      #     popd
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2ea44d17..4b55503d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         include:
           - os: 'macos-14'
-            version: '15.4'
+            version: '16.1'
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -22,6 +22,9 @@ jobs:
       - name: Install dependencies
         run: brew install ldid
 
+      - name: Install xcbeautify
+        run: brew install xcbeautify
+
       - name: Add PR suffix to version
         run: sed -e "/MARKETING_VERSION = .*/s/\$/-pr.${{ github.event.pull_request.number }}+$(git rev-parse --short ${COMMIT:-HEAD})/" -i '' Build.xcconfig
         env:
@@ -44,9 +47,76 @@ jobs:
         with:
           key: xcode-cache-deriveddata-${{ github.sha }}
           restore-keys: xcode-cache-deriveddata-
+          swiftpm-cache-key: xcode-cache-sourcedata-${{ github.sha }}
+          swiftpm-cache-restore-keys: |
+            xcode-cache-sourcedata-
 
+
+      - name: Restore Pods from Cache (Exact match)
+        id: pods-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ./Podfile.lock
+            ./Pods/
+            ./AltStore.xcworkspace/
+          key: pods-cache-${{ hashFiles('Podfile') }}
+          # restore-keys: |         # commented out to strictly check cache for this particular podfile
+          #   pods-cache-
+          
+      - name: Restore Pods from Cache (Last Available)
+        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }} 
+        id: pods-restore-recent
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ./Podfile.lock
+            ./Pods/
+            ./AltStore.xcworkspace/
+          key: pods-cache-
+
+      - name: Install CocoaPods
+        # if: ${{ steps.pods-restore.outputs.cache-hit != 'true'}}
+        id: pods-install
+        run: |
+          pod install
+
+      - name: Save Pods to Cache
+        id: save-pods
+        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ./Podfile.lock
+            ./Pods/
+            ./AltStore.xcworkspace/
+          key: pods-cache-${{ hashFiles('Podfile') }}
+    
+      - name: List Files and derived data
+        run: |
+          echo ">>>>>>>>> Workdir <<<<<<<<<<"
+          ls -la .
+          echo ""
+          
+          echo ">>>>>>>>> Pods <<<<<<<<<<"
+          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists    
+          echo ""
+          
+          echo ">>>>>>>>> SideStore <<<<<<<<<<"
+          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
+          echo ""
+          
+          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
+          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
+          echo ""
+          
+          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
+          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists    
+          echo ""
+
+        
       - name: Build SideStore
-        run: NSUnbufferedIO=YES make build | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
+        run: NSUnbufferedIO=YES make build 2>&1 | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
         run: make fakesign
@@ -67,4 +137,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SideStore-${{ steps.version.outputs.version }}-dSYM
-          path: ./*.dSYM/
+          path: ./SideStore.xcarchive/dSYMs/*