diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml
deleted file mode 100644
index 830c57a..0000000
--- a/.github/workflows/building.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Python CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8]
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install tox-travis coverage codacy-coverage
-      - name: Test with tox
-        run: |
-          tox
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/docker.yml
similarity index 81%
rename from .github/workflows/dockerimage.yml
rename to .github/workflows/docker.yml
index 3f2c5ce..1fb092f 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/docker.yml
@@ -1,10 +1,11 @@
 name: Docker Image CI
 
+# Only run after test passes
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  workflow_run:
+    workflows: ["Python CI"]
+    types:
+      - completed
 
 jobs:
 
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
new file mode 100644
index 0000000..f7042b8
--- /dev/null
+++ b/.github/workflows/python.yml
@@ -0,0 +1,25 @@
+name: Python CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install tox tox-gh-actions
+    - name: Test with tox
+      run: tox
\ No newline at end of file