diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b42cda77..f581818f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,7 +17,6 @@ on:
 
 jobs:
   build:
-#   runs-on: blacksmith-8vcpu-ubuntu-2404
     runs-on: self-hosted
     steps:
       - name: Checkout repository
@@ -86,6 +85,8 @@ jobs:
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.created=${{ github.run_id }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           outputs: type=registry,compression=gzip,compression-level=9
 
       - name: Cleanup Docker
diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
index 849a876c..53c00838 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -131,7 +131,6 @@ jobs:
           retention-days: 30
 
   build-linux:
-#   runs-on: blacksmith-4vcpu-ubuntu-2404
     runs-on: self-hosted
     if: (github.event.inputs.build_type == 'all' || github.event.inputs.build_type == 'linux' || github.event.inputs.build_type == '') && github.event.inputs.artifact_destination != 'submit'
     permissions:
@@ -152,7 +151,8 @@ jobs:
       - name: Install system dependencies for AppImage
         run: |
           sudo apt-get update
-          sudo apt-get install -y libfuse2
+          sudo apt-get install -y libfuse2 g++-10
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
 
       - name: Install dependencies
         run: |
@@ -689,7 +689,6 @@ jobs:
           retention-days: 30
 
   submit-to-flatpak:
- #  runs-on: blacksmith-4vcpu-ubuntu-2404
     runs-on: self-hosted
     if: github.event.inputs.artifact_destination == 'submit' && (github.event.inputs.build_type == 'all' || github.event.inputs.build_type == 'linux' || github.event.inputs.build_type == '')
     needs: []
@@ -846,8 +845,7 @@ jobs:
           retention-days: 30
 
   upload-to-release:
- #  runs-on: blacksmith-4vcpu-ubuntu-2404
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     if: github.event.inputs.artifact_destination == 'release'
     needs: [build-windows, build-linux, build-macos]
     permissions:
diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml
index 04383210..c9d81fb6 100644
--- a/.github/workflows/openapi.yml
+++ b/.github/workflows/openapi.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   generate-openapi:
     name: Generate OpenAPI JSON
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: self-hosted
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index b65c35ba..0d570a99 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   lint-and-build:
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: self-hosted
 
     env:
       NODE_OPTIONS: "--max-old-space-size=4096"
@@ -19,6 +19,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
+          cache: "npm"
 
       - name: Install dependencies
         run: npm ci