diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 134184a5..00000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: build
-
-# Run this workflow every time a new commit pushed to your repository
-on: push
-
-jobs:
-  build:
-    name: Build Wheel
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Python 3.9
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.9'
-      - name: Build Wheel
-        run: |
-          python -m pip install setuptools wheel
-          python setup.py bdist_wheel
-      - name: Archive pyqtgraph wheel
-        uses: actions/upload-artifact@v2
-        with:
-          name: wheel
-          path: |
-            dist
-
-# - stage: build
-#   dependsOn: []
-#   jobs:
-#   - job: "build_wheel"
-#     pool:
-#       vmImage: 'Ubuntu 18.04'
-#     steps:
-#     - task: UsePythonVersion@0
-#       inputs:
-#         versionSpec: 3.8
-#     - script: |
-#         python -m pip install setuptools wheel
-#         python setup.py bdist_wheel --universal
-#       displayName: "Build Python Wheel"
-#       continueOnError: false
-#     - publish: dist
-#       artifact: wheel
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/main.yml
similarity index 76%
rename from .github/workflows/test.yml
rename to .github/workflows/main.yml
index c11605b8..653f9acb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,8 @@ on: [push]
 
 jobs:
   build:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -20,7 +22,6 @@ jobs:
           - python-version: "3.9"
             qt-version: ""
             numpy-version: ""
-    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Setup Python ${{ matrix.python-version }}
@@ -94,3 +95,58 @@ jobs:
       with:
         name: Unit Test Results (Python ${{ matrix.python-version }} - Qt-Bindings ${{ matrix.qt-lib }} - OS ${{ matrix.os }})
         path: junit/test-results.xml
+
+  build-docs:
+    # Name the Job
+    name: Build Docs
+    # Set the type of machine to run on
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks out a copy of your repository on the ubuntu-latest machine
+      - uses: actions/checkout@v2
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - name: Build Docs
+        run: |
+          cd doc
+          python -m pip install -r requirements.txt
+          make html SPHINXOPTS='-W -v'
+    
+  linting:
+    name: Linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      # Runs the Super-Linter action
+      - name: Style check
+        run: |
+          pip install flake8
+          python -m flake8 .
+
+  build-wheel:
+    name: Build Wheel
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - name: Build Wheel
+        run: |
+          python -m pip install setuptools wheel
+          python setup.py bdist_wheel
+      - name: Archive pyqtgraph wheel
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheel
+          path: |
+            dist
\ No newline at end of file
diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
deleted file mode 100644
index bc285748..00000000
--- a/.github/workflows/pre-build.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: pre-build
-
-# Run this workflow every time a new commit pushed to your repository
-on: push
-
-jobs:
-  # Set the job key. The key is displayed as the job name
-  # when a job name is not provided
-  pre-build:
-    # Name the Job
-    name: Pre-Build
-    # Set the type of machine to run on
-    runs-on: ubuntu-latest
-
-    steps:
-      # Checks out a copy of your repository on the ubuntu-latest machine
-      - uses: actions/checkout@v2
-      - name: Setup Python 3.9
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.9'
-      # Runs the Super-Linter action
-      - name: Style check
-        run: |
-          pip install flake8
-          python -m flake8 .
-      - name: Build Docs
-        run: |
-          cd doc
-          python -m pip install -r requirements.txt
-          make html SPHINXOPTS='-W -v'
-
diff --git a/README.md b/README.md
index c148f1f3..cda77943 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Build Status](https://github.com/j9ac9k/pyqtgraph/workflows/.github/workflows/main.yml/badge.svg?branch=migrate-to-github-actions)
+[![Build Status](https://github.com/pyqtgraph/pyqtgraph/workflows/main/badge.svg)](https://github.com/pyqtgraph/pyqtgraph/workflows/main/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/pyqtgraph/badge/?version=latest)](https://pyqtgraph.readthedocs.io/en/latest/?badge=latest)
 
 PyQtGraph