diff --git a/.github/workflows/build-view.yml b/.github/workflows/build-view.yml
index 8cc231ec..0e7d4186 100644
--- a/.github/workflows/build-view.yml
+++ b/.github/workflows/build-view.yml
@@ -14,31 +14,38 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: warp-macos-15-arm64-12x
+          - os: [self-hosted, macOS, ARM64]
             arch: arm64
+            artifact_name: macos-arm64
           - os: windows-latest
             arch: x64
+            artifact_name: windows-latest
           - os: ubuntu-latest
             arch: x64
+            artifact_name: ubuntu-latest
 
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
+        with:
+          clean: true
 
       - name: Setup Node.js
+        if: "!contains(matrix.os, 'self-hosted')"
         uses: actions/setup-node@v6
         with:
           node-version: 20
 
       - name: Setup Python
+        if: "!contains(matrix.os, 'self-hosted')"
         uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 
       - name: Install Python Dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install uv
+          python3 -m pip install --upgrade pip
+          pip3 install uv
 
       - name: Install bun
         run: npm install -g bun
@@ -78,7 +85,6 @@ jobs:
         run: npm run build -- --arch ${{ matrix.arch }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # Signing variables (CSC_LINK, CSC_KEY_PASSWORD) are omitted for Windows
           VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
           VITE_STACK_PROJECT_ID: ${{ secrets.VITE_STACK_PROJECT_ID }}
           VITE_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.VITE_STACK_PUBLISHABLE_CLIENT_KEY }}
@@ -102,7 +108,7 @@ jobs:
         if: runner.os == 'macOS'
         uses: actions/upload-artifact@v6
         with:
-          name: release-${{ matrix.os }}-${{ matrix.arch }}
+          name: release-${{ matrix.artifact_name }}-${{ matrix.arch }}
           path: |
             release/*.dmg
           retention-days: 5
@@ -111,7 +117,7 @@ jobs:
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v6
         with:
-          name: release-${{ matrix.os }}-${{ matrix.arch }}
+          name: release-${{ matrix.artifact_name }}-${{ matrix.arch }}
           path: |
             release/*.exe
           retention-days: 5
@@ -120,7 +126,7 @@ jobs:
         if: runner.os == 'Linux'
         uses: actions/upload-artifact@v6
         with:
-          name: release-${{ matrix.os }}-${{ matrix.arch }}
+          name: release-${{ matrix.artifact_name }}-${{ matrix.arch }}
           path: |
             release/*.AppImage
           retention-days: 5
@@ -135,7 +141,7 @@ jobs:
       - name: Download mac-arm64 artifact
         uses: actions/download-artifact@v7
         with:
-          name: release-warp-macos-15-arm64-6x-arm64
+          name: release-macos-arm64-arm64
           path: temp-mac-arm64
 
       - name: Download win-x64 artifact
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b66b8981..44c65de1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,31 +25,38 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: warp-macos-15-arm64-12x
+          - os: [self-hosted, macOS, ARM64]
             arch: arm64
+            artifact_name: macos-arm64
           - os: windows-latest
             arch: x64
+            artifact_name: windows-latest
           - os: ubuntu-latest
             arch: x64
+            artifact_name: ubuntu-latest
 
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
+        with:
+          clean: true
 
       - name: Setup Node.js
+        if: "!contains(matrix.os, 'self-hosted')"
         uses: actions/setup-node@v6
         with:
           node-version: 20
 
       - name: Setup Python
+        if: "!contains(matrix.os, 'self-hosted')"
         uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 
       - name: Install Python Dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install uv
+          python3 -m pip install --upgrade pip
+          pip3 install uv
 
       - name: Install Dependencies
         run: npm install
@@ -83,7 +90,6 @@ jobs:
         run: npm run build -- --arch ${{ matrix.arch }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # Signing variables (CSC_LINK, CSC_KEY_PASSWORD) are omitted for Windows
           VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
           VITE_STACK_PROJECT_ID: ${{ secrets.VITE_STACK_PROJECT_ID }}
           VITE_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.VITE_STACK_PUBLISHABLE_CLIENT_KEY }}
@@ -103,7 +109,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v6
         with:
-          name: release-${{ matrix.os }}-${{ matrix.arch }}
+          name: release-${{ matrix.artifact_name }}-${{ matrix.arch }}
           path: |
             release/*
             !release/builder-debug.yml
@@ -120,7 +126,7 @@ jobs:
       - name: Download mac-arm64 artifact
         uses: actions/download-artifact@v7
         with:
-          name: release-warp-macos-15-arm64-6x-arm64
+          name: release-macos-arm64-arm64
           path: temp-mac-arm64
 
       - name: Download win-x64 artifact