diff --git a/.github/workflows/auto-deploy.yaml b/.github/workflows/auto-deploy.yaml
index b7fc8518..fa95254d 100644
--- a/.github/workflows/auto-deploy.yaml
+++ b/.github/workflows/auto-deploy.yaml
@@ -8,7 +8,7 @@ jobs:
   build-and-push:
     if: github.event.pull_request.merged == true
     name: Build and Push Docker Image
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/code-quality-workflow.yaml b/.github/workflows/code-quality-workflow.yaml
index 8f079e00..af903bcd 100644
--- a/.github/workflows/code-quality-workflow.yaml
+++ b/.github/workflows/code-quality-workflow.yaml
@@ -13,16 +13,14 @@ jobs:
   style-quality:
     if: github.event.pull_request.draft == false
     name: Code Style & Quality
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up pnpm
-        run: corepack prepare pnpm@latest --activate
-
-      - name: Add pnpm to PATH
-        run: echo "/home/btngana/.local/share/pnpm" >> $GITHUB_PATH
+      - uses: pnpm/action-setup@v6
+        with:
+          version: 10.28.0
 
       - uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/e2e-workflow.yaml b/.github/workflows/e2e-workflow.yaml
index b6804297..2fea0e45 100644
--- a/.github/workflows/e2e-workflow.yaml
+++ b/.github/workflows/e2e-workflow.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   e2e-tests:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     environment: e2e
     env:
       APP_POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
diff --git a/.github/workflows/pr-validation-workflow.yaml b/.github/workflows/pr-validation-workflow.yaml
index 1454167d..aecf8549 100644
--- a/.github/workflows/pr-validation-workflow.yaml
+++ b/.github/workflows/pr-validation-workflow.yaml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   validate-merge-permissions:
     if: github.event.pull_request.base.ref == 'main'
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     name: Validate Merge Permissions
     steps:
       - name: Verify Authorized User
@@ -31,7 +31,7 @@ jobs:
   branch-name-validation:
     if: github.event.pull_request.base.ref == 'dev'
     name: Validate branch naming convention
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     steps:
       - name: Enforce kebab-case branch name
@@ -49,7 +49,7 @@ jobs:
 
   validate-pr-title:
     name: Validate PR title format
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     steps:
       - name: Check PR title format
diff --git a/.github/workflows/testers-checklist.yaml b/.github/workflows/testers-checklist.yaml
index 4b18665e..1ff3768f 100644
--- a/.github/workflows/testers-checklist.yaml
+++ b/.github/workflows/testers-checklist.yaml
@@ -7,7 +7,7 @@ on:
 jobs:
   checklist:
     if: github.event.pull_request.draft == false
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     permissions:
       pull-requests: write