diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index ecf193ab..006d753d 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -1,14 +1,7 @@
 include:
   template: Dependency-Scanning.gitlab-ci.yml
 
-{% if cookiecutter.python_version == "3.7" %}
-image: python:3.7-buster
-{% elif cookiecutter.python_version == "3.8" %}
-image: python:3.8-buster
-{% else %}
-image: python:3.6-buster
-{% endif %}
-
+image: python:{{cookiecutter.python_version}}-buster
 services:
   - postgis/postgis:10-2.5
 
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml
index 456cda87..3a257b96 100644
--- a/{{cookiecutter.project_slug}}/pyproject.toml
+++ b/{{cookiecutter.project_slug}}/pyproject.toml
@@ -4,13 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 88
-{% if cookiecutter.python_version == "3.6" %}
-target-version = ['py36']
-{% elif cookiecutter.python_version == "3.7" %}
-target-version = ['py37']
-{% else %}
-target-version = ['py38']
-{% endif %}
+target-version = ["py{{cookiecutter.python_version|replace('.', '')}}"]
 include = '\.pyi?$'
 exclude = '''