diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce83e8e..ef59fd6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,4 +29,4 @@ workflows:
                 - screenshots
           matrix:
             parameters:
-              python-image: ["python:3.7", "python:3.8", "python:3.9", "python:3.10"]
+              python-image: ["python:3.7", "python:3.8", "python:3.9", "python:3.10", "python:3.11"]
diff --git a/Makefile b/Makefile
index 97c8639..b535913 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,11 @@ install:
 
 
 # Get GT4HistOCR Calamari model (from SBB)
+
 $(MODEL):
 	ocrd resmgr download ocrd-calamari-recognize $@
+	# Workaround, see #91 https://github.com/OCR-D/ocrd_calamari/issues/91
+	fix-calamari1-model ~/.local/share/ocrd-resources/ocrd-calamari-recognize/$@
 
 # Download example data (not used currently)
 actevedef_718448162: