diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..e63ebd105
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,12 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/action@v2.0.3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..ae194a33c
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,9 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: 38b88246ccc552bffaaf54259d064beeee434539  # frozen: v4.0.1
+    hooks:
+      - id: check-merge-conflict
+      - id: check-yaml
+
+ci:
+  autoupdate_schedule: quarterly
diff --git a/.travis.yml b/.travis.yml
index 39b4db147..775783dae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,36 +15,44 @@ services: docker
 
 jobs:
   include:
-    - name: "3.6 Xenial aarch64"
+    - name: "3.6 Focal aarch64"
       arch: arm64
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
         - MB_PYTHON_VERSION=3.6
-        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
-    - name: "3.7 Xenial aarch64"
+        - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
+    - name: "3.7 Focal aarch64"
       arch: arm64
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
         - MB_PYTHON_VERSION=3.7
-        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
-    - name: "3.8 Xenial aarch64"
+        - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
+    - name: "3.8 Focal aarch64"
       os: linux
       arch: arm64
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
         - MB_PYTHON_VERSION=3.8
-        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
-    - name: "3.9 Xenial aarch64"
+        - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
+    - name: "3.9 Focal aarch64"
       os: linux
       arch: arm64
       env:
         - PLAT=aarch64
         - MB_ML_VER=2014
         - MB_PYTHON_VERSION=3.9
-        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
+        - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
+    - name: "3.10 Focal aarch64"
+      os: linux
+      arch: arm64
+      env:
+        - PLAT=aarch64
+        - MB_ML_VER=2014
+        - MB_PYTHON_VERSION=3.10
+        - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
 
 before_install:
     - source multibuild/common_utils.sh