diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 398152e9b914f9511d75cea876dbc8c890ff4db7..6448cd867ed1e303b79c04182d5974626b6cc98f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,12 @@ install-py3.8:
     script:
         - make install
 
+install-py3.9:
+    image: docker.km3net.de/base/python:3.9
+    stage: install
+    script:
+        - make install
+
 install-dev-py3.6:
     image: docker.km3net.de/base/python:3.6
     stage: install-dev
@@ -49,6 +55,12 @@ install-dev-py3.8:
     script:
         - make install-dev
 
+install-dev-py3.9:
+    image: docker.km3net.de/base/python:3.9
+    stage: install-dev
+    script:
+        - make install-dev
+
 test-py3.6:
     image: docker.km3net.de/base/python:3.6
     stage: test
@@ -70,6 +82,13 @@ test-py3.8:
         - make install-dev
         - make test
 
+test-py3.9:
+    image: docker.km3net.de/base/python:3.9
+    stage: test
+    script:
+        - make install-dev
+        - make test
+
 doc-py3.6:
     image: docker.km3net.de/base/python:3.6
     stage: doc
@@ -90,3 +109,10 @@ doc-py3.8:
     script:
         - make install-dev
         - cd doc && make html
+
+doc-py3.9:
+    image: docker.km3net.de/base/python:3.9
+    stage: doc
+    script:
+        - make install-dev
+        - cd doc && make html
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index b314eb683db8e4b300ec65717e651e10fec2f1ca..afd3011c9f1cc41f9040665953d766237d927f5f 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -51,8 +51,16 @@ test-py3.8:
         - make test
     <<: *junit_definition
 
+test-py3.9:
+    image: docker.km3net.de/base/python:3.9
+    stage: test
+    script:
+        - *virtualenv_definition
+        - make test
+    <<: *junit_definition
+
 code-style:
-    image: docker.km3net.de/base/python:3.8
+    image: docker.km3net.de/base/python:3.9
     stage: test
     script:
         - *virtualenv_definition
@@ -60,22 +68,20 @@ code-style:
     allow_failure: true
 
 coverage:
-    image: docker.km3net.de/base/python:3.8
+    image: docker.km3net.de/base/python:3.9
     stage: coverage
     script:
         - *virtualenv_definition
         - make install-dev
         - "make test-cov|grep TOTAL| awk '{printf \"COVERAGE: %.2f%%\", (1-$3/$2)*100 }'"
     coverage: '/COVERAGE:\s*([0-9]*\.[0-9]*%)/'
-    #     - make test-cov
-    # coverage: '/TOTAL.+ ([0-9]{1,3}%)/'
     artifacts:
         paths:
             - reports/coverage
 
 
 build-docs:
-    image: docker.km3net.de/base/python:3.8
+    image: docker.km3net.de/base/python:3.9
     stage: doc
     script:
         - *virtualenv_definition
@@ -83,7 +89,7 @@ build-docs:
     cache: {}
 
 pages:
-    image: docker.km3net.de/base/python:3.8
+    image: docker.km3net.de/base/python:3.9
     stage: doc
     script:
         - *virtualenv_definition
@@ -100,7 +106,7 @@ pages:
 
 
 pypi:
-    image: docker.km3net.de/base/python:3.8
+    image: docker.km3net.de/base/python:3.9
     stage: release
     cache: {}
     script: