diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index c63922e2..945671b1 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -1,14 +1,13 @@
 name: Build and Publish Client Artifacts
 
-on: {} # Temporarily disable the trigger to avoid unnecessary builds
-
-#on:
-#  pull_request: # Change to push when ready to deploy
-#    branches:
-#      - master
-#    paths:
-#      - client/**
-#      - .github/workflows/client_build.yml
+on:
+  workflow_call:
+  #pull_request: # Change to push when ready to deploy
+  #  branches:
+  #    - master
+  #  paths:
+  #    - client/**
+  #    - .github/workflows/client_build.yml
 
 jobs:
   client_build:
diff --git a/.github/workflows/ghcr_amd64.yml b/.github/workflows/ghcr_amd64.yml
index 8cf3894a..1f90d672 100644
--- a/.github/workflows/ghcr_amd64.yml
+++ b/.github/workflows/ghcr_amd64.yml
@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate base Dockerfile
-        run: ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
+        run: go run docker/main.go -i Dockerfile.tmpl -o Dockerfile
 
       - name: Build and push
         uses: docker/build-push-action@v6
diff --git a/.github/workflows/ghcr_arm.yml b/.github/workflows/ghcr_arm.yml
index 1ea9bcd6..a7c6f9f5 100644
--- a/.github/workflows/ghcr_arm.yml
+++ b/.github/workflows/ghcr_arm.yml
@@ -15,36 +15,12 @@ env:
 
 jobs:
   build-client:
-    name: Build client artifacts
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: npm
-          cache-dependency-path: client/package-lock.json
-
-      - name: Install dependencies
-        working-directory: ./client
-        run: npm ci
-
-      - name: Build client
-        working-directory: ./client
-        run: npm run build
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: client
-          path: client/dist
+    uses: ./.github/workflows/client_build.yml
 
   build-base:
     name: Build base image
     runs-on: ubuntu-latest
+    needs: [ build-client ]
     permissions:
       packages: write
       contents: read
@@ -85,7 +61,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate base Dockerfile
-        run: ./docker/main.go -i Dockerfile.tmpl -o Dockerfile -client client/dist
+        run: go run docker/main.go -i Dockerfile.tmpl -o Dockerfile -client client/dist
 
       - name: Build and push
         uses: docker/build-push-action@v6
diff --git a/.github/workflows/ghcr_intel.yml b/.github/workflows/ghcr_intel.yml
index 2a06e489..9f651aa4 100644
--- a/.github/workflows/ghcr_intel.yml
+++ b/.github/workflows/ghcr_intel.yml
@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate base Dockerfile
-        run: ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
+        run: go run docker/main.go -i Dockerfile.tmpl -o Dockerfile
 
       - name: Build and push
         uses: docker/build-push-action@v6
diff --git a/.github/workflows/ghcr_nvidia.yml b/.github/workflows/ghcr_nvidia.yml
index f664ba85..2d221420 100644
--- a/.github/workflows/ghcr_nvidia.yml
+++ b/.github/workflows/ghcr_nvidia.yml
@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate base Dockerfile
-        run: ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
+        run: go run docker/main.go -i Dockerfile.tmpl -o Dockerfile
 
       - name: Build and push
         uses: docker/build-push-action@v6
diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
index b44a94f3..b378453c 100644
--- a/.github/workflows/server_build.yml
+++ b/.github/workflows/server_build.yml
@@ -1,14 +1,13 @@
 name: Build and Publish Server Artifacts
 
-on: {} # Temporarily disable the trigger to avoid unnecessary builds
-
-#on:
-#  pull_request: # Change to push when ready to deploy
-#    branches:
-#      - master
-#    paths:
-#      - server/**
-#      - .github/workflows/server_build.yml
+on:
+  workflow_call:
+  #pull_request: # Change to push when ready to deploy
+  #  branches:
+  #    - master
+  #  paths:
+  #    - server/**
+  #    - .github/workflows/server_build.yml
 
 jobs:
   server_build: