diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5aeda5c..747fbb7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,16 +2,19 @@ version: 2
 
 jobs:
 
-  build-python37:
-    docker:
-      - image: python:3.7
+  build-python:
+    parameters:
+      python-version:
+        type: string
+     docker:
+      - image: cimg/python:<< parameters.python-version >>
     steps:
       - checkout
       - restore_cache:
           keys:
             - ocrd-resources-{{ checksum "requirements.txt" }}-{{ checksum "Makefile" }}
       - run: make install
-      - run: make model
+      - run: make models
       - save_cache:
           key: ocrd-resources-{{ checksum "requirements.txt" }}-{{ checksum "Makefile" }}
           paths:
@@ -19,27 +22,13 @@ jobs:
       - run: git submodule update --init
       - run: make test
 
-  build-python38:
-    docker:
-      - image: python:3.8
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - ocrd-resources-{{ checksum "requirements.txt" }}-{{ checksum "Makefile" }}
-      - run: make install
-      - run: make model
-      - save_cache:
-          key: ocrd-resources-{{ checksum "requirements.txt" }}-{{ checksum "Makefile" }}
-          paths:
-            ocrd-resources
-      - run: git submodule update --init
-      - run: make test
 
 workflows:
   version: 2
   build:
     jobs:
-      - build-python37
-      - build-python38
+      - build-python
+          matrix:
+            parameters:
+              python-version: ['3.7', '3.8', '3.9', '3.10']