diff --git a/.github/workflows/catalyst.yaml b/.github/workflows/catalyst.yaml
index 1345f9814..15f9ca661 100644
--- a/.github/workflows/catalyst.yaml
+++ b/.github/workflows/catalyst.yaml
@@ -15,7 +15,8 @@ concurrency:
 jobs:
   docker:
     name: ${{ matrix.docker_images.label }} (${{ matrix.targets.target_suffix }}${{ matrix.targets.debug_suffix }})
-    runs-on: ubuntu-latest-m
+    # Uses a self-hosted ubuntu based actions runner
+    runs-on: ubuntu-amd64
     permissions:
       packages: write
       contents: read
@@ -40,7 +41,7 @@ jobs:
             target: stripped
             target_suffix: "-arm64"
             debug_suffix: ""
-          # example: livepeer/catalyst:latest-amd-debug
+          # example: livepeer/catalyst:latest-amd64-debug
           # unstripped binaries for use with gdb coredump debugging
           - platforms: linux/amd64
             target: full
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 85ac7b100..cf5bea97f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,7 +13,8 @@ concurrency:
 jobs:
   test:
     name: Test the catalyst project
-    runs-on: ubuntu-latest-m
+    # Uses a self-hosted ubuntu based actions runner
+    runs-on: ubuntu-amd64
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -28,7 +29,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
-          go-version: '1.20.5'
+          go-version: "1.20.5"
           cache: true
           cache-dependency-path: go.sum
 
@@ -53,13 +54,17 @@ jobs:
         uses: FedericoCarboni/setup-ffmpeg@v2
 
       - name: Run tests with coverage
-        run: go test --covermode=atomic --coverprofile=coverage.out $(go list ./... | grep -v 'test/e2e')
+        run:
+          go test --covermode=atomic --coverprofile=coverage.out $(go list ./...
+          | grep -v 'test/e2e')
 
       - name: Build Docker image
         run: make docker DOCKER_TAG=catalyst-e2e-test
 
       - name: Run E2E tests
-        run: go test $(go list ./... | grep 'test/e2e') --timeout 15m --image catalyst-e2e-test
+        run:
+          go test $(go list ./... | grep 'test/e2e') --timeout 15m --image
+          catalyst-e2e-test
 
       - name: Upload coverage reports
         uses: codecov/codecov-action@v3